[openejb-scm] openejb/modules/core/src/java/org/openejb/server/ejbd EjbRequestHandler.java

[gdamour]

gdamour     2005/02/21 03:55:27

  Modified:    modules/core/src/java/org/openejb/server/ejbd
                        EjbRequestHandler.java
  Log:

  GERONIMO-591.
  
  Finder can return null if the selected value is a cmr path. Filter out the 
null values accordingly.
  
  Revision  Changes    Path
  1.17      +6 -9      
openejb/modules/core/src/java/org/openejb/server/ejbd/EjbRequestHandler.java
  
  Index: EjbRequestHandler.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/EjbRequestHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- EjbRequestHandler.java    19 Feb 2005 09:46:39 -0000      1.16
  +++ EjbRequestHandler.java    21 Feb 2005 08:55:27 -0000      1.17
  @@ -45,14 +45,14 @@
   
   package org.openejb.server.ejbd;
   
  +import java.io.NotSerializableException;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  -import java.io.NotSerializableException;
  +import java.lang.reflect.Method;
   import java.rmi.RemoteException;
   import java.util.Collection;
  -import java.lang.reflect.Method;
  +
   import javax.security.auth.Subject;
  -import javax.ejb.Handle;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -66,8 +66,6 @@
   import org.openejb.client.EJBResponse;
   import org.openejb.client.RequestMethods;
   import org.openejb.client.ResponseCodes;
  -import org.openejb.client.EJBObjectProxy;
  -import org.openejb.client.EJBObjectHandler;
   import org.openejb.proxy.BaseEJB;
   import org.openejb.proxy.ProxyInfo;
   
  @@ -418,10 +416,9 @@
               BaseEJB proxy = (BaseEJB) result;
               ProxyInfo info = proxy.getProxyInfo();
               res.setResponse(EJB_OK_FOUND, info.getPrimaryKey());
  +        } else if (null == result) {
  +            res.setResponse(EJB_OK_FOUND, null);
           } else {
  -
  -            // There should be no else, the entity should be found
  -            // or an exception should be thrown.
               //TODO:3: Localize all error messages in an separate file.
               // TODO:4: It should provide more info on the wrong method
               final String message = "The bean is not EJB compliant. " +