cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/reporters ResultCollector.java

[sebb]

sebb        2004/03/07 15:33:03

  Modified:    src/core/org/apache/jmeter/reporters ResultCollector.java
  Log:
  Fix possible NPE and ensure Reader is closed
  
  Revision  Changes    Path
  1.36      +9 -7      
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
  
  Index: ResultCollector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ResultCollector.java      5 Mar 2004 01:58:32 -0000       1.35
  +++ ResultCollector.java      7 Mar 2004 23:33:03 -0000       1.36
  @@ -42,7 +42,6 @@
   import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
   import org.apache.jmeter.engine.event.LoopIterationEvent;
   import org.apache.jmeter.engine.util.NoThreadClone;
  -import org.apache.jmeter.junit.JMeterTestCase;
   import org.apache.jmeter.samplers.Clearable;
   import org.apache.jmeter.samplers.Remoteable;
   import org.apache.jmeter.samplers.SampleEvent;
  @@ -57,9 +56,7 @@
   
   
   /**
  - * @author Michael Stover
  - * @author <a href="mailto:kcassell&#X0040;apache.org";>Keith Cassell</a>
  - * @version $Id$
  + * @version $Revision$ on $Date$
    */
   public class ResultCollector
       extends AbstractListenerElement
  @@ -174,6 +171,7 @@
           if (new File(getFilename()).exists())
           {
               clearVisualizer();
  +            BufferedReader dataReader = null;
               try
               {
                   Configuration savedSamples = getConfiguration(getFilename());
  @@ -181,7 +179,7 @@
               }
               catch(SAXException e)
               {
  -                BufferedReader dataReader = new BufferedReader(new 
FileReader(getFilename()));
  +                dataReader = new BufferedReader(new FileReader(getFilename()));
                   String line;
                   while((line = dataReader.readLine()) != null)
                   {
  @@ -192,6 +190,10 @@
               {
                   log.error("", e);
               }
  +            finally
  +                     {
  +             if (dataReader != null) dataReader.close();
  +            }
           }
           //inLoading = false;
       }
  @@ -294,7 +296,7 @@
           } catch (IOException e) {
                log.warn("Error trying to find XML terminator "+e.toString());
                try {
  -                             raf.close();
  +                             if (raf != null) raf.close();
                        } catch (IOException e1) {}
                        return false;
                }
  
  
  

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