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

[maguro]

maguro      2005/03/20 18:07:39

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

  Better debug msgs.  Destroy ORB after shutdown.  Fixed CSSBean defaults.
  
  Revision  Changes    Path
  1.11      +3 -2      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CORBABean.java    19 Mar 2005 04:14:13 -0000      1.10
  +++ CORBABean.java    20 Mar 2005 23:07:39 -0000      1.11
  @@ -156,6 +156,7 @@
   
       public void doStop() throws Exception {
           orb.shutdown(true);
  +        orb.destroy();
           log.info("Stopped CORBABean");
       }
   
  
  
  
  1.6       +23 -8     
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSBean.java      18 Mar 2005 08:26:09 -0000      1.5
  +++ CSSBean.java      20 Mar 2005 23:07:39 -0000      1.6
  @@ -145,7 +145,6 @@
       }
   
       public void setNssArgs(ArrayList nssArgs) {
  -        if (nssArgs == null) nssArgs = new ArrayList();
           this.nssArgs = nssArgs;
       }
   
  @@ -163,7 +162,6 @@
       }
   
       public void setNssProps(Properties nssProps) {
  -        if (nssProps == null) nssProps = new Properties();
           this.nssProps = nssProps;
       }
   
  @@ -178,7 +176,8 @@
   
       public org.omg.CORBA.Object getHome(URI nsURI, String name) {
   
  -        if (log.isDebugEnabled()) log.debug("Looking up home from " + 
nsURI.toString() + " at " + name);
  +        if (log.isDebugEnabled()) log.debug(description + " - Looking up 
home from " + nsURI.toString() + " at " + name);
  +
           try {
               org.omg.CORBA.Object ref = 
nssORB.string_to_object(nsURI.toString());
               NamingContextExt ic = NamingContextExtHelper.narrow(ref);
  @@ -189,15 +188,25 @@
   
               return cssORB.string_to_object(beanIOR);
           } catch (UserException ue) {
  -            // do nothing
  +            log.error(description + " - Looking up home", ue);
               throw new RuntimeException(ue);
           }
       }
   
       public void doStart() throws Exception {
   
  -        if (nssConfig == null) nssConfig = cssConfig;
  -        if (nssArgs == null) nssArgs = cssArgs;
  +        if (nssConfig == null) {
  +            if (log.isDebugEnabled()) log.debug("Defaulting NSS config to be 
CSS config");
  +            nssConfig = cssConfig;
  +        }
  +        if (nssArgs == null) {
  +            if (log.isDebugEnabled()) log.debug("Defaulting NSS args to be 
CSS args");
  +            nssArgs = cssArgs;
  +        }
  +        if (nssProps == null) {
  +            if (log.isDebugEnabled()) log.debug("Defaulting NSS props to be 
CSS props");
  +            nssProps = cssProps;
  +        }
   
           ClassLoader savedLoader = 
Thread.currentThread().getContextClassLoader();
           try {
  @@ -206,6 +215,8 @@
               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);
   
               threadPool.execute(new Runnable() {
  @@ -217,6 +228,8 @@
               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);
   
               org.omg.CORBA.Object ref = 
cssORB.resolve_initial_references("ORBPolicyManager");
  @@ -250,7 +263,9 @@
       public void doStop() throws Exception {
   
           nssORB.shutdown(true);
  +        nssORB.destroy();
           cssORB.shutdown(true);
  +        cssORB.destroy();
           log.info("Stopped CORBA Client Security Server - " + description);
       }