[openejb-scm] openejb/modules/core/src/java/org/openejb/corba CORBABean.java

[dain]

dain        2005/03/23 00:21:25

  Modified:    modules/core/src/java/org/openejb/corba CORBABean.java
  Log:

  Allow tssConfig and converter to be null
  
  Revision  Changes    Path
  1.12      +15 -7     
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CORBABean.java    20 Mar 2005 23:07:39 -0000      1.11
  +++ CORBABean.java    23 Mar 2005 05:21:25 -0000      1.12
  @@ -89,7 +89,11 @@
       public CORBABean(String configAdapter, ClassLoader classLoader, Executor 
threadPool, OpenORBNameBean namingService, SecurityService securityService) 
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
           this.classLoader = classLoader;
           this.threadPool = threadPool;
  -        this.configAdapter = (ConfigAdapter) 
classLoader.loadClass(configAdapter).newInstance();
  +        if (configAdapter != null) {
  +            this.configAdapter = (ConfigAdapter) 
classLoader.loadClass(configAdapter).newInstance();
  +        } else {
  +            this.configAdapter = null;
  +        }
           //naming service included to force start order.
           //security service included to force start order.
       }
  @@ -133,10 +137,14 @@
           try {
               Thread.currentThread().setContextClassLoader(classLoader);
   
  -            Properties properties = 
configAdapter.translateToProps(tssConfig);
  -            properties.putAll(props);
  -
  -            orb = ORB.init(configAdapter.translateToArgs(tssConfig, args), 
properties);
  +            if (configAdapter != null) {
  +                Properties properties = 
configAdapter.translateToProps(tssConfig);
  +                properties.putAll(props);
  +
  +                orb = ORB.init(configAdapter.translateToArgs(tssConfig, 
args), properties);
  +            } else {
  +                orb = ORB.init((String[]) args.toArray(new 
String[args.size()]), props);
  +            }
   
               org.omg.CORBA.Object obj = 
orb.resolve_initial_references("RootPOA");