tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util CustomObjectInputStream.java
Date Thu, 02 Sep 2004 18:45:17 GMT
markt       2004/09/02 11:45:17

  Modified:    .        RELEASE-NOTES-4.1.txt
               catalina/src/share/org/apache/catalina/util
                        CustomObjectInputStream.java
  Log:
  Fix bug 19701. Unable to serialize array of custom class
   - Port of Remy's fix in TC5 for bug 22146
  
  Revision  Changes    Path
  1.88      +5 -1      jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt
  
  Index: RELEASE-NOTES-4.1.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- RELEASE-NOTES-4.1.txt	30 Aug 2004 20:00:26 -0000	1.87
  +++ RELEASE-NOTES-4.1.txt	2 Sep 2004 18:45:17 -0000	1.88
  @@ -1242,6 +1242,10 @@
            Incorrect handling of negative timeout in
            SingleSignOn.sessionEvent()
   
  +[4.1.31] #19701
  +         Session persistence
  +         Fix serialization of array of custom class
  +
   
   ----------------
   Coyote Bug Fixes:
  
  
  
  1.4       +10 -10    jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
  
  Index: CustomObjectInputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CustomObjectInputStream.java	26 Aug 2004 21:42:40 -0000	1.3
  +++ CustomObjectInputStream.java	2 Sep 2004 18:45:17 -0000	1.4
  @@ -26,9 +26,9 @@
    * class loader for this web application.  This allows classes defined only
    * with the web application to be found correctly.
    *
  - * @@author Craig R. McClanahan
  - * @@author Bip Thelin
  - * @@version $Revision$, $Date$
  + * @author Craig R. McClanahan
  + * @author Bip Thelin
  + * @version $Revision$, $Date$
    */
   
   public final class CustomObjectInputStream
  @@ -43,10 +43,10 @@
       /**
        * Construct a new instance of CustomObjectInputStream
        *
  -     * @@param stream The input stream we will read from
  -     * @@param classLoader The class loader used to instantiate objects
  +     * @param stream The input stream we will read from
  +     * @param classLoader The class loader used to instantiate objects
        *
  -     * @@exception IOException if an input/output error occurs
  +     * @exception IOException if an input/output error occurs
        */
       public CustomObjectInputStream(InputStream stream,
                                      ClassLoader classLoader)
  @@ -60,14 +60,14 @@
        * Load the local class equivalent of the specified stream class
        * description, by using the class loader assigned to this Context.
        *
  -     * @@param classDesc Class description from the input stream
  +     * @param classDesc Class description from the input stream
        *
  -     * @@exception ClassNotFoundException if this class cannot be found
  -     * @@exception IOException if an input/output error occurs
  +     * @exception ClassNotFoundException if this class cannot be found
  +     * @exception IOException if an input/output error occurs
        */
       public Class resolveClass(ObjectStreamClass classDesc)
           throws ClassNotFoundException, IOException {
   
  -        return (classLoader.loadClass(classDesc.getName()));
  +        return Class.forName(classDesc.getName(), false, classLoader);
       }
   }
  
  
  

---------------------------------------------------------------------
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