src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
changeset 59311 b42eaca7d234
parent 49765 ee6f7a61f3a5
equal deleted inserted replaced
59310:72f3dd43dd28 59311:b42eaca7d234
     1 /*
     1 /*
     2  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
     2  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.  Oracle designates this
     7  * published by the Free Software Foundation.  Oracle designates this
   208         idleConnections.clear();
   208         idleConnections.clear();
   209         timer.cancel();
   209         timer.cancel();
   210         if (timer1Enabled) {
   210         if (timer1Enabled) {
   211             timer1.cancel();
   211             timer1.cancel();
   212         }
   212         }
   213         if (dispatcherThread != null) {
   213         if (dispatcherThread != null && dispatcherThread != Thread.currentThread()) {
   214             try {
   214             try {
   215                 dispatcherThread.join();
   215                 dispatcherThread.join();
   216             } catch (InterruptedException e) {
   216             } catch (InterruptedException e) {
   217                 Thread.currentThread().interrupt();
   217                 Thread.currentThread().interrupt();
   218                 logger.log (Level.TRACE, "ServerImpl.stop: ", e);
   218                 logger.log (Level.TRACE, "ServerImpl.stop: ", e);