[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/rmi ...
Ron Sigal
ron_sigal at yahoo.com
Fri May 18 22:39:15 EDT 2007
User: rsigal
Date: 07/05/18 22:39:15
Modified: src/main/org/jboss/remoting/transport/rmi Tag: remoting_2_x
RemotingRMIClientSocketFactory.java
Log:
JBREM-714: Ignore configMaps if InvokerLocator is null (if server is older version).
Revision Changes Path
No revision
No revision
1.9.4.5 +13 -8 JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemotingRMIClientSocketFactory.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java,v
retrieving revision 1.9.4.4
retrieving revision 1.9.4.5
diff -u -b -r1.9.4.4 -r1.9.4.5
--- RemotingRMIClientSocketFactory.java 6 Feb 2007 04:23:23 -0000 1.9.4.4
+++ RemotingRMIClientSocketFactory.java 19 May 2007 02:39:15 -0000 1.9.4.5
@@ -66,7 +66,7 @@
* with localhost will allow the retrieval of objects bound to localhost.
*
* @author <a href="mailto:r.sigal at computer.org">Ron Sigal</a>
- * @version $Revision: 1.9.4.4 $
+ * @version $Revision: 1.9.4.5 $
* <p/>
* Copyright (c) 2005
* </p>
@@ -166,6 +166,9 @@
// Note: the previous observation might be incorrect. The phenomenon of missing
// entries in configMaps might simply have been an error in the definition of
// ComparableHolder.equals. See JBREM-697.
+
+ if (invokerLocator != null)
+ {
ComparableHolder holder = new ComparableHolder(invokerLocator);
if (!configMaps.containsKey(holder))
{
@@ -174,9 +177,11 @@
return new Socket(host, port);
}
socketFactory = retrieveSocketFactory(holder);
- String effectiveHost = hostName != null ? hostName : host;
+ }
+ String effectiveHost = hostName != null ? hostName : host;
Socket socket = null;
+
if(socketFactory != null)
{
socket = socketFactory.createSocket(effectiveHost, port);
More information about the jboss-cvs-commits
mailing list