yoavs       2004/08/31 07:05:22

  Modified:    catalina/src/share/org/apache/catalina/session Tag:
                        TOMCAT_5_0 ManagerBase.java
               webapps/docs Tag: TOMCAT_5_0 changelog.xml
  Log:
  Added explicit close of randomIS DataInputStream in ManagerBase for better resource 
handling.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.27.2.1  +14 -1     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
  
  Index: ManagerBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
  retrieving revision 1.27
  retrieving revision 1.27.2.1
  diff -u -r1.27 -r1.27.2.1
  --- ManagerBase.java  26 May 2004 16:13:59 -0000      1.27
  +++ ManagerBase.java  31 Aug 2004 14:05:22 -0000      1.27.2.1
  @@ -510,6 +510,12 @@
                       if( log.isDebugEnabled() )
                           log.debug( "Opening " + devRandomSource );
                   } catch( IOException ex ) {
  +                    try {
  +                     randomIS.close();
  +                    } catch (Exception e) {
  +                        log.warn("Failed to close randomIS.");
  +                    }
  +
                       randomIS=null;
                   }
               }
  @@ -803,6 +809,13 @@
               } catch( Exception ex ) {
               }
               devRandomSource=null;
  + 
  +            try {
  +             randomIS.close();
  +            } catch (Exception e) {
  +             log.warn("Failed to close randomIS.");
  +         }
  +
               randomIS=null;
           }
           Random random = getRandom();
  
  
  
  No                   revision
  No                   revision
  1.70.2.21 +3 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.70.2.20
  retrieving revision 1.70.2.21
  diff -u -r1.70.2.20 -r1.70.2.21
  --- changelog.xml     31 Aug 2004 13:35:31 -0000      1.70.2.20
  +++ changelog.xml     31 Aug 2004 14:05:22 -0000      1.70.2.21
  @@ -39,6 +39,9 @@
         <fix>
           <bug>30624</bug>: Enhanced null checking in 
RealmBase#findSecurityConstraints. (yoavs)
         </fix>
  +      <fix>
  +        Added explicit close of randomIS DataInputStream to ManagerBase for better 
resource handling. (yoavs)
  +      </fix>
       </changelog>
     </subsection>
     <subsection name="Webapps">
  
  
  

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

Reply via email to