[med-svn] r7491 - trunk/packages/pixelmed/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-19 15:35:56 +0000 (Fri, 19 Aug 2011)
New Revision: 7491

Modified:
   trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
Log:
New patch

Modified: trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch	2011-08-19 15:27:04 UTC (rev 7490)
+++ trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch	2011-08-19 15:35:56 UTC (rev 7491)
@@ -1,32 +1,18 @@
 Index: pixelmed-20110717/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java
 ===================================================================
---- pixelmed-20110717.orig/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java	2010-05-31 13:33:40.000000000 +0200
-+++ pixelmed-20110717/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java	2011-08-19 17:22:05.000000000 +0200
-@@ -204,7 +204,7 @@
- 	/**
- 	 * <p>Stop DNS Self-Discovery.</p>
- 	 */
--	public void deActivateDiscovery() {
-+	public void deActivateDiscovery() throws IOException {
+--- pixelmed-20110717.orig/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java	2011-08-19 17:33:10.000000000 +0200
++++ pixelmed-20110717/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java	2011-08-19 17:35:09.000000000 +0200
+@@ -208,7 +208,12 @@
  if (debugLevel > 1) System.err.println("NetworkConfigurationFromMulticastDNS.deActivateDiscovery():");
  		if (jmDNS != null) {
  			jmDNS.unregisterAllServices();
-Index: pixelmed-20110717/com/pixelmed/network/NetworkConfigurationSource.java
-===================================================================
---- pixelmed-20110717.orig/com/pixelmed/network/NetworkConfigurationSource.java	2010-02-17 18:09:30.000000000 +0100
-+++ pixelmed-20110717/com/pixelmed/network/NetworkConfigurationSource.java	2011-08-19 17:26:41.000000000 +0200
-@@ -4,6 +4,7 @@
- 
- import java.util.Timer;
- import java.util.TimerTask;
-+import java.io.IOException;
- 
- /**
-  * <p>This abstract class provides a source of DICOM network parameters.</p>
-@@ -114,5 +115,5 @@
- 	/**
- 	 * <p>Stop discovery.</p>
- 	 */
--	abstract public void deActivateDiscovery();
-+	abstract public void deActivateDiscovery() throws IOException;
- }
+-			jmDNS.close();		// needed, since otherwise application will not exit when main thread finished
++      try {
++        jmDNS.close();		// needed, since otherwise application will not exit when main thread finished
++      } catch ( IOException e ) {
++        e.printStackTrace(System.err);
++        jmDNS = null;
++      }
+ 		}
+ 	}
+