You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/19 11:21:18 UTC
svn commit: r1447658 -
/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
Author: rmannibucau
Date: Tue Feb 19 10:21:17 2013
New Revision: 1447658
URL: http://svn.apache.org/r1447658
Log:
oops java7 api - back to java 6
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=1447658&r1=1447657&r2=1447658&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Tue Feb 19 10:21:17 2013
@@ -38,6 +38,7 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
@@ -359,7 +360,13 @@ public class EjbDaemon implements org.ap
final RequestInfo value = forceRequestInfo();
final SocketAddress remoteSocketAddress = socket.getRemoteSocketAddress();
if (remoteSocketAddress != null && InetSocketAddress.class.isInstance(remoteSocketAddress)) {
- value.ip = InetSocketAddress.class.cast(remoteSocketAddress).getHostString();
+ final InetSocketAddress socketAddress = InetSocketAddress.class.cast(remoteSocketAddress);
+ final InetAddress address = socketAddress.getAddress();
+ if (address != null) {
+ value.ip = address.getHostAddress();
+ } else {
+ value.ip = socketAddress.getHostName();
+ }
}
}