ozeigermann    2004/06/24 05:10:00

  Modified:    src/share/org/apache/slide/common SlideTokenImpl.java
                        SlideToken.java SlideTokenWrapper.java
  Log:
  Documented and cleaned external transaction flag
  
  Revision  Changes    Path
  1.12      +13 -5     
jakarta-slide/src/share/org/apache/slide/common/SlideTokenImpl.java
  
  Index: SlideTokenImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideTokenImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SlideTokenImpl.java       23 Jun 2004 09:57:14 -0000      1.11
  +++ SlideTokenImpl.java       24 Jun 2004 12:10:00 -0000      1.12
  @@ -122,8 +122,12 @@
       private Hashtable resolveCache = new Hashtable();
       private Hashtable matchPrincipalCache = new Hashtable();
   
  +    /**
  +     * Determines if this request is part of an externally controlled transaction. 
  +     */
       private boolean isExternalTransaction = false;
       
  +    
       // ------------------------------------------------------------- Properties
       
       
  @@ -390,12 +394,16 @@
           throw new UnsupportedOperationException();
       }
   
  -
  +    /**
  +     * Checks if this request is part of an externally controlled transaction. 
  +     */
       public boolean isExternalTransaction() {
           return isExternalTransaction;
       }
   
  -
  +    /**
  +     * Sets if this request is part of an externally controlled transaction. 
  +     */
       public void setExternalTx() {
           isExternalTransaction = true;
       }
  
  
  
  1.18      +11 -4     jakarta-slide/src/share/org/apache/slide/common/SlideToken.java
  
  Index: SlideToken.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideToken.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SlideToken.java   23 Jun 2004 09:57:14 -0000      1.17
  +++ SlideToken.java   24 Jun 2004 12:10:00 -0000      1.18
  @@ -262,7 +262,14 @@
       
       public void setForceLock(boolean forceLock);
       
  +    /**
  +     * Checks if this request is part of an externally controlled transaction. 
  +     */
       public boolean isExternalTransaction();
  +
  +    /**
  +     * Sets if this request is part of an externally controlled transaction. 
  +     */
       public void setExternalTx();
   }
   
  
  
  
  1.12      +13 -10    
jakarta-slide/src/share/org/apache/slide/common/SlideTokenWrapper.java
  
  Index: SlideTokenWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideTokenWrapper.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SlideTokenWrapper.java    23 Jun 2004 09:57:14 -0000      1.11
  +++ SlideTokenWrapper.java    24 Jun 2004 12:10:00 -0000      1.12
  @@ -56,6 +56,7 @@
           this.forceStoreEnlistment = true;// forceStoreEnlistment;
           this.forceSecurity = token.isForceSecurity();
           this.forceLock = token.isForceLock();
  +        this.isExternalTransaction = token.isExternalTransaction();
       }
       
       
  @@ -71,8 +72,7 @@
       private boolean forceStoreEnlistment = false;
       private boolean forceSecurity = true;
       private boolean forceLock = true;
  -    
  -    
  +    private boolean isExternalTransaction = false;
       
       // ------------------------------------------------------------- Properties
       
  @@ -334,14 +334,17 @@
           return wrappedToken.checkMatchPrincipalCache(checkSubject, matchSubject);
       }
   
  +    /**
  +     * Checks if this request is part of an externally controlled transaction. 
  +     */
       public boolean isExternalTransaction() {
  -        return wrappedToken.isExternalTransaction();
  +        return isExternalTransaction;
       }
   
  -
  +    /**
  +     * Sets if this request is part of an externally controlled transaction. 
  +     */
       public void setExternalTx() {
  -        wrappedToken.setExternalTx();
  +        isExternalTransaction = true;
       }
  -
  -    
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to