commit 9ef551daf79f89766a70e8b4ff8c075686c7b455
author Babak Vahdat <bvahdat@apache.org> Tue Jul 09 15:49:34 2013 +0200
committer Hadrian Zbarcea <hzbarcea@gmail.com> Tue Jul 09 17:27:53 2013 -0400
tree e8279ca6f56ef808433c29949103a69c093f0c71
parent e3057169061ee04967109f7428273c452500f505

CAMEL-6521: Fixed the failed build when Java 6 is in use.

camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java

diff --git a/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java b/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
index 297860c..3afe604 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.impl;
 
+import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.camel.spi.UuidGenerator;
-import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.InetAddressUtil;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
@@ -78,7 +78,16 @@
                     LOG.warn("Cannot generate unique stub by using DNS and binding to local port: " + idGeneratorPort + " due " + ioe.getMessage());
                 }
             } finally {
-                IOHelper.close(ss);
+                try {
+                    // TODO: replace the following line with IOHelper.close(ss) when Java 6 support is dropped
+                    ss.close();
+                } catch (IOException ioe) {
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("Closing the server socket failed", ioe);
+                    } else {
+                        LOG.warn("Closing the server socket failed" + " due " + ioe.getMessage());
+                    }
+                }
             }
         }