You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/07/09 15:49:39 UTC
git commit: CAMEL-6521: Fixed the failed build when Java 6 is in use.
Updated Branches:
refs/heads/master 4664d64c6 -> ee6ec2c35
CAMEL-6521: Fixed the failed build when Java 6 is in use.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee6ec2c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee6ec2c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee6ec2c3
Branch: refs/heads/master
Commit: ee6ec2c3522491f188de85fb5d5eb339a49b35ed
Parents: 4664d64
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Jul 9 15:49:34 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Jul 9 15:49:34 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/ActiveMQUuidGenerator.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee6ec2c3/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 @@ public class ActiveMQUuidGenerator implements UuidGenerator {
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());
+ }
+ }
}
}