maguro 2005/04/12 17:29:54
Modified: modules/core/src/java/org/openejb/corba CORBABean.java
CSSBean.java
Log:
The primary port of the IOR must be zero if the CSI component contains a
secure transport mechanism. Much of this is to work around the Sun ORB.
Revision Changes Path
1.16 +4 -6
openejb/modules/core/src/java/org/openejb/corba/CORBABean.java
Index: CORBABean.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/CORBABean.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CORBABean.java 8 Apr 2005 02:02:50 -0000 1.15
+++ CORBABean.java 12 Apr 2005 21:29:54 -0000 1.16
@@ -141,10 +141,8 @@
Thread.currentThread().setContextClassLoader(classLoader);
if (configAdapter != null) {
- Properties properties =
configAdapter.translateToProps(tssConfig);
- properties.putAll(props);
-
- orb = ORB.init(configAdapter.translateToArgs(tssConfig,
args), properties);
+ orb = ORB.init(configAdapter.translateToArgs(tssConfig,
args), configAdapter.translateToProps(tssConfig, props));
+ configAdapter.postProcess(tssConfig, orb);
} else {
orb = ORB.init((String[]) args.toArray(new
String[args.size()]), props);
}
1.9 +6 -10
openejb/modules/core/src/java/org/openejb/corba/CSSBean.java
Index: CSSBean.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/CSSBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CSSBean.java 2 Apr 2005 01:05:21 -0000 1.8
+++ CSSBean.java 12 Apr 2005 21:29:54 -0000 1.9
@@ -212,12 +212,10 @@
try {
Thread.currentThread().setContextClassLoader(classLoader);
- Properties properties =
configAdapter.translateToProps(nssConfig);
- properties.putAll(nssProps);
-
if (log.isDebugEnabled()) log.debug("Starting NameService ORB");
- nssORB = ORB.init((String[]) nssArgs.toArray(new
String[nssArgs.size()]), properties);
+ nssORB = ORB.init(configAdapter.translateToArgs(nssConfig,
nssArgs), configAdapter.translateToProps(nssConfig, nssProps));
+ configAdapter.postProcess(nssConfig, nssORB);
threadPool.execute(new Runnable() {
public void run() {
@@ -225,12 +223,10 @@
}
});
- properties = configAdapter.translateToProps(cssConfig);
- properties.putAll(cssProps);
-
if (log.isDebugEnabled()) log.debug("Starting CSS ORB");
- cssORB = ORB.init((String[]) cssArgs.toArray(new
String[cssArgs.size()]), properties);
+ cssORB = ORB.init(configAdapter.translateToArgs(cssConfig,
cssArgs), configAdapter.translateToProps(cssConfig, cssProps));
+ configAdapter.postProcess(cssConfig, cssORB);
threadPool.execute(new Runnable() {
public void run() {
