You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ri...@apache.org on 2006/12/04 20:49:49 UTC
svn commit: r482319 -
/incubator/openejb/branches/v2_2/openejb2/modules/openejb-yoko/src/main/java/org/apache/openejb/yoko/SocketFactory.java
Author: rickmcguire
Date: Mon Dec 4 11:49:48 2006
New Revision: 482319
URL: http://svn.apache.org/viewvc?view=rev&rev=482319
Log:
OPENEJB-396 Yoko SocketFactory not handling CSIv2 compliant connections properly.
Modified:
incubator/openejb/branches/v2_2/openejb2/modules/openejb-yoko/src/main/java/org/apache/openejb/yoko/SocketFactory.java
Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-yoko/src/main/java/org/apache/openejb/yoko/SocketFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-yoko/src/main/java/org/apache/openejb/yoko/SocketFactory.java?view=diff&rev=482319&r1=482318&r2=482319
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-yoko/src/main/java/org/apache/openejb/yoko/SocketFactory.java (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-yoko/src/main/java/org/apache/openejb/yoko/SocketFactory.java Mon Dec 4 11:49:48 2006
@@ -188,6 +188,14 @@
int supports = transportConfig.getSupports();
int requires = transportConfig.getRequires();
+ // The CSIv2 spec requires that the port for a secure connection be
+ // placed in the transport config and the port value in the normal
+ // IIOP profile be 0. If we see a zero port value, then we need to
+ // replace it with the transport specified one.
+ if (port <= 0) {
+ port = transportConfig.getPort();
+ }
+
if (log.isDebugEnabled()) {
log.debug("IOR from target " + address.getHostName() + ":" + port);