tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarc...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session StandardSession.java
Date Thu, 01 Apr 2004 17:39:53 GMT
jfarcand    2004/04/01 09:39:53

  Modified:    catalina/src/share/org/apache/catalina Globals.java
               catalina/src/share/org/apache/catalina/session
                        StandardSession.java
  Log:
  Minor fixe. Instead of using an exclude list, make the variable transient.
  
  Revision  Changes    Path
  1.8       +2 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java
  
  Index: Globals.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Globals.java	27 Feb 2004 14:58:38 -0000	1.7
  +++ Globals.java	1 Apr 2004 17:39:53 -0000	1.8
  @@ -287,7 +287,7 @@
       /**
        * The subject under which the AccessControlContext is running.
        */
  -    public static final String SUBJECT_ATTR =
  +    public static transient final String SUBJECT_ATTR =
           "javax.security.auth.subject";
   
       
  
  
  
  1.42      +2 -26     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
  
  Index: StandardSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- StandardSession.java	25 Mar 2004 22:17:54 -0000	1.41
  +++ StandardSession.java	1 Apr 2004 17:39:53 -0000	1.42
  @@ -160,14 +160,6 @@
   
   
       /**
  -     * Set of attribute names which are not allowed to be persisted.
  -     */
  -    private static final String[] excludedAttributes = {
  -        Globals.SUBJECT_ATTR
  -    };
  -
  -
  -    /**
        * We are currently processing a session expiration, so bypass
        * certain IllegalStateException tests.  NOTE:  This value is not
        * included in the serialized version of this object.
  @@ -1393,8 +1385,7 @@
               }
               if (value == null)
                   continue;
  -            else if ( (value instanceof Serializable) 
  -                    && (!exclude(keys[i]) )) {
  +            else if ( (value instanceof Serializable) ) {
                   saveNames.add(keys[i]);
                   saveValues.add(value);
               } else {
  @@ -1422,21 +1413,6 @@
               }
           }
   
  -    }
  -
  -
  -    /**
  -     * Exclude attribute that cannot be serialized.
  -     * @param name the attribute's name
  -     */
  -    protected boolean exclude(String name){
  -
  -        for (int i = 0; i < excludedAttributes.length; i++) {
  -            if (name.equalsIgnoreCase(excludedAttributes[i]))
  -                return true;
  -        }
  -
  -        return false;
       }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message