camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [01/10] camel git commit: Fixed todo
Date Fri, 06 Nov 2015 07:31:48 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 5cbdace38 -> 5ca0e663c
  refs/heads/master 48f64e4a9 -> f55834e06


Fixed todo


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca7fe373
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca7fe373
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca7fe373

Branch: refs/heads/master
Commit: ca7fe37339d436e0c69630adffb298b747d3a5af
Parents: 4b23332
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Nov 5 22:11:13 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Nov 6 08:34:25 2015 +0100

----------------------------------------------------------------------
 .../apache/camel/impl/ActiveMQUuidGenerator.java    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ca7fe373/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 6817ad5..7a4f0d0 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;
@@ -94,19 +94,7 @@ public class ActiveMQUuidGenerator implements UuidGenerator {
                     Thread.currentThread().interrupt();
                 }
             } finally {
-                // some environments, such as a PaaS may not allow us to create the ServerSocket
-                if (ss != null) {
-                    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()
+ ". This exception is ignored.");
-                        }
-                    }
-                }
+                IOHelper.close(ss);
             }
         }
 


Mime
View raw message