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

[jBoss CVS Development]

  User: oberg   
  Date: 00/10/25 14:56:44

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/server
                        JRMPContainerInvoker.java
  Log:
  Changed optimziation enabling logic. Check whether class of called method is 
compatible with container-local class. Should work :-)
  
  Revision  Changes    Path
  1.29      +5 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JRMPContainerInvoker.java 2000/10/25 11:08:19     1.28
  +++ JRMPContainerInvoker.java 2000/10/25 21:56:43     1.29
  @@ -72,7 +72,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.28 $
  + *      @version $Revision: 1.29 $
    */
   public abstract class JRMPContainerInvoker
      extends RemoteServer
  @@ -174,7 +174,8 @@
      {
         // Check if this call really can be optimized
         // If parent of callers classloader is != parent of our classloader -> not 
optimizable!
  -      if (Thread.currentThread().getContextClassLoader().getParent() != 
container.getClassLoader().getParent())
  +//      if (Thread.currentThread().getContextClassLoader().getParent() != 
container.getClassLoader().getParent())
  +      if 
(!m.getDeclaringClass().isAssignableFrom(((ContainerInvokerContainer)container).getHomeClass()))
         {
            RemoteMethodInvocation rmi = new RemoteMethodInvocation(null, m, args);
         
  @@ -210,7 +211,8 @@
      {
           // Check if this call really can be optimized
           // If parent of callers classloader is != parent of our classloader -> not 
optimizable!
  -        if (Thread.currentThread().getContextClassLoader().getParent() != 
container.getClassLoader().getParent())
  +//      if (Thread.currentThread().getContextClassLoader().getParent() != 
container.getClassLoader().getParent())
  +        if 
(!m.getDeclaringClass().isAssignableFrom(((ContainerInvokerContainer)container).getRemoteClass()))
           {
              RemoteMethodInvocation rmi = new RemoteMethodInvocation(id, m, args);