db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r572001 - /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Date Sun, 02 Sep 2007 15:16:56 GMT
Author: kahatlen
Date: Sun Sep  2 08:16:56 2007
New Revision: 572001

URL: http://svn.apache.org/viewvc?rev=572001&view=rev
Log:
DERBY-3042: Remove Java 1.3 specific code in NetworkServerControlImpl.setUpSocket()

Removed the workaround since the network server does not run under
Java 1.3 any more.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=572001&r1=572000&r2=572001&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Sun Sep  2 08:16:56 2007
@@ -2241,27 +2241,17 @@
 										if (hostAddress == null)
 											hostAddress = InetAddress.getByName(hostArg);
 
-										// JDK131 can't connect with a client
-										// socket with 0.0.0.0 (all addresses) so we will
-										// getLocalHost() which will suffice.
-										InetAddress connectAddress;
-										if (JVMInfo.JDK_ID <= JVMInfo.J2SE_13 &&
-											hostAddress.getHostAddress().equals("0.0.0.0"))
-											connectAddress = InetAddress.getLocalHost();
-										else
-											connectAddress = hostAddress;
-
 										switch(getSSLMode()) {
 										case SSL_BASIC:
 											SSLSocket s1 = (SSLSocket)NaiveTrustManager.getSocketFactory().
-												createSocket(connectAddress, portNumber);
+												createSocket(hostAddress, portNumber);
 											// Need to handshake now to get proper error reporting.
 											s1.startHandshake();
 											return s1;
 
 										case SSL_PEER_AUTHENTICATION:
 											SSLSocket s2 = (SSLSocket)SSLSocketFactory.getDefault().
-												createSocket(connectAddress, portNumber);
+												createSocket(hostAddress, portNumber);
 											// Need to handshake now to get proper error reporting.
 											s2.startHandshake();
 											return s2;
@@ -2269,7 +2259,7 @@
 										case SSL_OFF:
 										default:
 											return SocketFactory.getDefault().
-												createSocket(connectAddress, portNumber);
+												createSocket(hostAddress, portNumber);
 										}
 									}
 								}



Mime
View raw message