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

[maguro]

maguro      2005/04/20 14:42:42

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

  Other TSS beans can close the manager.
  
  Revision  Changes    Path
  1.9       +8 -3      
openejb/modules/core/src/java/org/openejb/corba/TSSBean.java
  
  Index: TSSBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/TSSBean.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TSSBean.java      12 Apr 2005 15:35:12 -0000      1.8
  +++ TSSBean.java      20 Apr 2005 18:42:42 -0000      1.9
  @@ -63,6 +63,7 @@
   import org.omg.PortableServer.POA;
   import org.omg.PortableServer.RequestProcessingPolicyValue;
   import org.omg.PortableServer.ServantRetentionPolicyValue;
  +import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
   
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
  @@ -207,7 +208,11 @@
                   }
               }
               adapters.clear();
  -            localPOA.the_POAManager().deactivate(true, true);
  +            try {
  +                localPOA.the_POAManager().deactivate(true, true);
  +            } catch (AdapterInactive adapterInactive) {
  +                // do nothing - this may have already been deactivated.
  +            }
               localPOA = null;
           }
           log.info("Stopped CORBA Target Security Service in POA " + POAName);