shut down DNS multicast uncleanly but a lot more quickly

jenkinsci · Aug 9, 2011 · 1fbc512 · 1fbc512
1 parent a4dc8db
commit 1fbc512
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/changelog.html b/changelog.html
@@ -57,6 +57,8 @@
 <ul class=image>
   <li class=bug>
     Fixed a bug where SSH public key authentication for CLI wasn't working for username/password based security realm.
+  <li class=rfe>
+    Improved the speed of shutdown
   <li class=rfe>
     Added a dignosis CLI command to report the current granted authorities.
 </ul>

diff --git a/core/pom.xml b/core/pom.xml
@@ -429,7 +429,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>jmdns</artifactId>
-      <version>3.4.0-jenkins-2</version>
+      <version>3.4.0-jenkins-3</version>
     </dependency>
     <dependency>
       <groupId>com.sun.winsw</groupId>

diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java
@@ -52,12 +52,12 @@ public DNSMultiCast(Jenkins hudson) {
 
     public void close() {
         if (jmdns!=null) {
-            try {
-                jmdns.close();
+//            try {
+                jmdns.abort();
                 jmdns = null;
-            } catch (final IOException e) {
-                LOGGER.log(Level.WARNING,"Failed to close down JmDNS instance!",e);
-            }
+//            } catch (final IOException e) {
+//                LOGGER.log(Level.WARNING,"Failed to close down JmDNS instance!",e);
+//            }
         }
     }
 

diff --git a/licenseCompleter.groovy b/licenseCompleter.groovy
@@ -47,7 +47,7 @@ complete {
         rewriteLicense([],license("BSD License","http://dom4j.sourceforge.net/dom4j-1.6.1/license.html"))
     }
 
-    match(["org.codehaus.groovy:*","*:jmdns"]) {
+    match(["org.codehaus.groovy:*"]) {
         // see http://groovy.codehaus.org/License+Information
         // see http://jmdns.sourceforge.net/license.html
         rewriteLicense([],apacheLicense)