You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2007/03/29 20:39:28 UTC
svn commit: r523792 -
/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java
Author: rickmcguire
Date: Thu Mar 29 11:39:27 2007
New Revision: 523792
URL: http://svn.apache.org/viewvc?view=rev&rev=523792
Log:
GERONIMO-3043 Default assembly CORBABeans cannot change listener port.
Modified:
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java?view=diff&rev=523792&r1=523791&r2=523792
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java Thu Mar 29 11:39:27 2007
@@ -267,18 +267,6 @@
* the ORB.
*/
private void resolveListenerAddress() {
- // if we have a config with a TSSSSLTransportConfig defined, the
- // host and port from the config override bean-configured values.
- if (tssConfig != null) {
- TSSTransportMechConfig transportMech = tssConfig.getTransport_mech();
- if (transportMech != null) {
- if (transportMech instanceof TSSSSLTransportConfig) {
- TSSSSLTransportConfig transportConfig = (TSSSSLTransportConfig) transportMech;
- host = transportConfig.getHostname();
- listenerPort = transportConfig.getPort();
- }
- }
- }
// now provide defaults for anything still needing resolving
if (host == null) {
try {
@@ -288,9 +276,23 @@
host = "localhost";
}
}
-
+
// if nothing has been explicitly specified, we use a port value of -1, which
// allows the ORB to allocate the address.
+
+ // if we have a config with a TSSSSLTransportConfig defined, the
+ // host and port from the config override bean-configured values.
+ if (tssConfig != null) {
+ TSSTransportMechConfig transportMech = tssConfig.getTransport_mech();
+ if (transportMech != null) {
+ if (transportMech instanceof TSSSSLTransportConfig) {
+ TSSSSLTransportConfig transportConfig = (TSSSSLTransportConfig) transportMech;
+ transportConfig.setHostname(host);
+ transportConfig.setPort((short)listenerPort);
+ }
+ }
+ }
+
}
/**