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

[djencks]

djencks     2005/03/28 17:55:55

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

  Add NamedUsernamePasswordCredential and supporting infrastructure to allow 
configuring security info for ws client calls
  
  Revision  Changes    Path
  1.19      +11 -13    
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- EjbRequestHandler.java    23 Mar 2005 08:23:23 -0000      1.18
  +++ EjbRequestHandler.java    28 Mar 2005 22:55:55 -0000      1.19
  @@ -142,18 +142,17 @@
                * The identification principal contains the subject id.  Use 
this
                * id to obtain the registered subject.
                */
  +            Subject subject = null;
               IdentificationPrincipal principal = (IdentificationPrincipal) 
req.getClientIdentity();
               if (principal != null && principal.getId() != null) {
  -                Subject subject = 
ContextManager.getRegisteredSubject(principal.getId());
  -
  -                if (subject == null) {
  -                    subject = container.getDefaultSubject();
  -                }
  -                
  -                ContextManager.setCurrentCaller(subject);
  -                ContextManager.setNextCaller(subject);
  +                subject = 
ContextManager.getRegisteredSubject(principal.getId());
  +            } else {
  +                subject = container.getDefaultSubject();
               }
   
  +            ContextManager.setCurrentCaller(subject);
  +            ContextManager.setNextCaller(subject);
  +
               log.debug("setting cl=" + cl + " for " + 
container.getContainerID());
           } catch (RemoteException e) {
               replyWithFatalError
  @@ -188,7 +187,7 @@
                       doEjbObject_BUSINESS_METHOD(req, res);
                       break;
   
  -                // Home interface methods
  +                    // Home interface methods
                   case EJB_HOME_METHOD:
                       doEjbHome_METHOD(req, res);
                       break;
  @@ -201,7 +200,7 @@
                       doEjbHome_FIND(req, res);
                       break;
   
  -                // javax.ejb.EJBObject methods
  +                    // javax.ejb.EJBObject methods
                   case EJB_OBJECT_GET_EJB_HOME:
                       doEjbObject_GET_EJB_HOME(req, res);
                       break;
  @@ -222,7 +221,7 @@
                       doEjbObject_REMOVE(req, res);
                       break;
   
  -                // javax.ejb.EJBHome methods
  +                    // javax.ejb.EJBHome methods
                   case EJB_HOME_GET_EJB_META_DATA:
                       doEjbHome_GET_EJB_META_DATA(req, res);
                       break;
  @@ -268,7 +267,6 @@
               call.reset();
           }
       }
  -
   
   
       private Object invoke(EJBRequest req) throws Throwable {