Author: cschneider
Date: Wed Nov 21 15:59:38 2012
New Revision: 1412160
URL: http://svn.apache.org/viewvc?rev=1412160&view=rev
Log:
Adding apache header and small refactoring
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/LocalHostUtil.java
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/LocalHostUtil.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/LocalHostUtil.java?rev=1412160&r1=1412159&r2=1412160&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/LocalHostUtil.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/LocalHostUtil.java
Wed Nov 21 15:59:38 2012
@@ -1,3 +1,21 @@
+/**
+ * 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.cxf.dosgi.dsw.handlers;
import java.net.InetAddress;
@@ -6,19 +24,21 @@ import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
/**
* Utility methods to get the local address even on a linux host
*/
public class LocalHostUtil {
-
+
private LocalHostUtil() {
// Util Class
}
-
+
/**
- * Returns an InetAddress representing the address of the localhost. Every
attempt is made to find an address for
- * this host that is not the loopback address. If no other address can be
found, the loopback will be returned.
+ * Returns an InetAddress representing the address of the localhost. Every
+ * attempt is made to find an address for this host that is not the
loopback
+ * address. If no other address can be found, the loopback will be
returned.
*
* @return InetAddress - the address of localhost
* @throws UnknownHostException
@@ -37,49 +57,26 @@ public class LocalHostUtil {
}
/**
- * This method attempts to find all InetAddresses for this machine in a
conventional way (via InetAddress). If only
- * one address is found and it is the loopback, an attempt is made to
determine the addresses for this machine using
- * NetworkInterface.
- *
- * @return InetAddress[] - all addresses assigned to the local machine
- * @throws UnknownHostException
- * - if there is a problem determining addresses
- */
- public static InetAddress[] getAllLocal() throws UnknownHostException {
- InetAddress[] iAddresses = InetAddress.getAllByName("127.0.0.1");
- if (iAddresses.length != 1)
- return iAddresses;
- if (!iAddresses[0].isLoopbackAddress())
- return iAddresses;
- return getAllLocalUsingNetworkInterface();
-
- }
-
- /**
- * Utility method that delegates to the methods of NetworkInterface to
determine addresses for this machine.
+ * Utility method that delegates to the methods of NetworkInterface to
+ * determine addresses for this machine.
*
* @return InetAddress[] - all addresses found from the NetworkInterfaces
* @throws UnknownHostException
* - if there is a problem determining addresses
*/
private static InetAddress[] getAllLocalUsingNetworkInterface() throws
UnknownHostException {
- ArrayList addresses = new ArrayList();
- Enumeration e = null;
try {
- e = NetworkInterface.getNetworkInterfaces();
+ List<InetAddress> addresses = new ArrayList<InetAddress>();
+ Enumeration<NetworkInterface> e =
NetworkInterface.getNetworkInterfaces();
+ while (e.hasMoreElements()) {
+ NetworkInterface ni = (NetworkInterface) e.nextElement();
+ for (Enumeration<InetAddress> e2 = ni.getInetAddresses();
e2.hasMoreElements();) {
+ addresses.add(e2.nextElement());
+ }
+ }
+ return addresses.toArray(new InetAddress[] {});
} catch (SocketException ex) {
throw new UnknownHostException("127.0.0.1");
}
- while (e.hasMoreElements()) {
- NetworkInterface ni = (NetworkInterface) e.nextElement();
- for (Enumeration e2 = ni.getInetAddresses();
e2.hasMoreElements();) {
- addresses.add(e2.nextElement());
- }
- }
- InetAddress[] iAddresses = new InetAddress[addresses.size()];
- for (int i = 0; i < iAddresses.length; i++) {
- iAddresses[i] = (InetAddress) addresses.get(i);
- }
- return iAddresses;
}
}
