svn commit: r1028229 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java main/java/org/apache/camel/util/InetAddressUtil.java test/java/org/apache/camel/util/InetAddressUtilTest.java

[da...@apache.org]

Author: davsclaus
Date: Thu Oct 28 08:54:09 2010
New Revision: 1028229

URL: http://svn.apache.org/viewvc?rev=1028229&view=rev
Log:
CAMEL-3289: Applied patch from AMQ-2965 to let Camel be able to resolve hostname in AMQ id generator in a more resillient way.

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/InetAddressUtil.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java?rev=1028229&r1=1028228&r2=1028229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java Thu Oct 28 08:54:09 2010
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.impl;
 
-import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.camel.spi.UuidGenerator;
+import org.apache.camel.util.InetAddressUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -55,7 +55,7 @@ public class ActiveMQUuidGenerator imple
 
         if (canAccessSystemProps) {
             try {
-                hostName = InetAddress.getLocalHost().getHostName();
+                hostName = InetAddressUtil.getLocalHostName();
                 ServerSocket ss = new ServerSocket(0);
                 stub = "-" + ss.getLocalPort() + "-" + System.currentTimeMillis() + "-";
                 Thread.sleep(100);

Added: camel/trunk/camel-core/src/main/java/org/apache/camel/util/InetAddressUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/InetAddressUtil.java?rev=1028229&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/InetAddressUtil.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/InetAddressUtil.java Thu Oct 28 08:54:09 2010
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Util class for {@link java.net.InetAddress}
+ */
+public final class InetAddressUtil {
+
+    private InetAddressUtil() {
+        // util class
+    }
+
+    /**
+     * When using the {@link java.net.InetAddress#getHostName()} method in an
+     * environment where neither a proper DNS lookup nor an <tt>/etc/hosts</tt>
+     * entry exists for a given host, the following exception will be thrown:
+     * <p/>
+     * <code>
+     * java.net.UnknownHostException: &lt;hostname&gt;: &lt;hostname&gt;
+     * at java.net.InetAddress.getLocalHost(InetAddress.java:1425)
+     * ...
+     * </code>
+     * <p/>
+     * Instead of just throwing an UnknownHostException and giving up, this
+     * method grabs a suitable hostname from the exception and prevents the
+     * exception from being thrown. If a suitable hostname cannot be acquired
+     * from the exception, only then is the <tt>UnknownHostException</tt> thrown.
+     *
+     * @return the hostname
+     * @throws UnknownHostException is thrown if hostname could not be resolved
+     */
+    public static String getLocalHostName() throws UnknownHostException {
+        try {
+            return (InetAddress.getLocalHost()).getHostName();
+        } catch (UnknownHostException uhe) {
+            String host = uhe.getMessage(); // host = "hostname: hostname"
+            if (host != null) {
+                int colon = host.indexOf(':');
+                if (colon > 0) {
+                    return host.substring(0, colon);
+                }
+            }
+            throw uhe;
+        }
+    }
+
+}

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java?rev=1028229&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java Thu Oct 28 08:54:09 2010
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import java.net.UnknownHostException;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Revision$
+ */
+public class InetAddressUtilTest extends TestCase {
+
+    public void testGetLocalHostName() throws Exception {
+        try {
+            String name = InetAddressUtil.getLocalHostName();
+            assertNotNull(name);
+        } catch (UnknownHostException e) {
+            // ignore if this test is run on a OS which cannot resolve hostname
+        }
+    }
+}