cvs commit: logging-log4j/src/java/org/apache/log4j/xml DOMConfigurator.java

[ceki]

ceki        2004/01/22 11:47:43

  Modified:    src/java/org/apache/log4j PropertyConfigurator.java
               src/java/org/apache/log4j/xml DOMConfigurator.java
  Log:
  Added Rob Butler's patch. PropertyConfigurator and DOMConfigrator close
  the InputStream they created when configuring from a URL.
  
  Revision  Changes    Path
  1.62      +4 -1      
logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
  
  Index: PropertyConfigurator.java
  ===================================================================
  RCS file: 
/home/cvs/logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- PropertyConfigurator.java 22 Jan 2004 19:39:03 -0000      1.61
  +++ PropertyConfigurator.java 22 Jan 2004 19:47:43 -0000      1.62
  @@ -69,6 +69,7 @@
   
   import java.io.FileInputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   
   import java.util.Enumeration;
   import java.util.Hashtable;
  @@ -456,7 +457,9 @@
       LogLog.debug("Reading configuration from URL " + configURL);
   
       try {
  -      props.load(configURL.openStream());
  +      InputStream in = configURL.openStream();
  +      props.load(in);
  +      in.close();
       } catch (java.io.IOException e) {
         LogLog.error(
           "Could not read configuration file from URL [" + configURL + "].", e);
  
  
  
  1.61      +3 -1      logging-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
  
  Index: DOMConfigurator.java
  ===================================================================
  RCS file: 
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- DOMConfigurator.java      22 Jan 2004 19:42:14 -0000      1.60
  +++ DOMConfigurator.java      22 Jan 2004 19:47:43 -0000      1.61
  @@ -732,7 +732,9 @@
   
     public void doConfigure(URL url, LoggerRepository repository) {
       try {
  -      doConfigure(url.openStream(), repository);
  +     InputStream in = url.openStream();
  +     doConfigure(in, repository);
  +     in.close();
       } catch (IOException e) {
         LogLog.error("Could not open [" + url + "].", e);
       }
  
  
  

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