[jBoss-Dev] CVS update:jboss/src/main/org/jboss/ejb/plugins/jrmp/server JRMPContainerInvoker.java

[jBoss CVS Development]

  User: salborini
  Date: 00/08/17 18:47:24

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/server
                        JRMPContainerInvoker.java
  Log:
  Fixed undeploy: unbind jndi names and unexport
  
  Revision  Changes    Path
  1.17      +15 -3     
jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java
  
  Index: JRMPContainerInvoker.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JRMPContainerInvoker.java 2000/08/17 20:13:16     1.16
  +++ JRMPContainerInvoker.java 2000/08/18 01:47:24     1.17
  @@ -15,6 +15,7 @@
   import java.rmi.ServerException;
   import java.rmi.RemoteException;
   import java.rmi.MarshalledObject;
  +import java.rmi.NoSuchObjectException;
   import java.rmi.server.RemoteServer;
   import java.rmi.server.UnicastRemoteObject;
   import java.security.Principal;
  @@ -72,7 +73,7 @@
    *      @author Rickard �berg ([EMAIL PROTECTED])
    *           @author <a href="mailto:[EMAIL PROTECTED]">Sebastien 
Alborini</a>
    *      @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *      @version $Revision: 1.16 $
  + *      @version $Revision: 1.17 $
    */
   public abstract class JRMPContainerInvoker
      extends RemoteServer
  @@ -335,8 +336,19 @@
      
      public void stop()
      {
  -      //MF FIXME: do we need to remove the stuff from JNDI and un-export the stuff?
  -      GenericProxy.removeLocal(container.getBeanMetaData().getJndiName());
  +      // remove the stuff from JNDI and un-export the stuff
  +       try {
  +               InitialContext ctx = new InitialContext();
  +               ctx.unbind(container.getBeanMetaData().getJndiName());
  +               ctx.unbind("invokers/"+container.getBeanMetaData().getJndiName());
  +               
  +               UnicastRemoteObject.unexportObject(this, true);
  +               
  +       } catch (Exception e) {
  +               // ignore.
  +       }
  +       
  +       GenericProxy.removeLocal(container.getBeanMetaData().getJndiName());
      }
   
      public void destroy()