cvs commit: cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user UserHandler.java

[cziegeler]

cziegeler    2003/05/04 13:43:23

  Modified:    
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user
                        UserHandler.java
  Log:
  Correct version...
  
  Revision  Changes    Path
  1.6       +10 -5     
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java
  
  Index: UserHandler.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UserHandler.java  4 May 2003 20:30:56 -0000       1.5
  +++ UserHandler.java  4 May 2003 20:43:23 -0000       1.6
  @@ -97,11 +97,9 @@
       /**
        * Create a new handler object.
        */
  -    public UserHandler(HandlerConfiguration handler) 
  -    throws ProcessingException {
  +    public UserHandler(HandlerConfiguration handler) {
           this.handler = handler;
           this.context = new AuthenticationContext(this);
  -        this.userID = (String) this.context.getContextInfo().get("ID");
       }
   
       /**
  @@ -217,6 +215,13 @@
        * Get the unique user id
        */
       public String getUserId() {
  -        return this.getUserId();
  +        if ( null == this.userID) {
  +            try {
  +                this.userID = (String) 
this.context.getContextInfo().get("ID");
  +            } catch (ProcessingException ignore) {
  +                this.userID = "";
  +            }
  +        }
  +        return this.userID;
       }
   }