You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by kh...@apache.org on 2001/11/23 17:09:15 UTC

cvs commit: jakarta-jmeter/src/org/apache/jmeter/save/handlers FilerHandler.java

khammond    01/11/23 08:09:15

  Modified:    src/org/apache/jmeter/save/handlers FilerHandler.java
  Log:
  Patch for bug #5037 submitted by James Boutcher.
  
  Revision  Changes    Path
  1.5       +35 -17    jakarta-jmeter/src/org/apache/jmeter/save/handlers/FilerHandler.java
  
  Index: FilerHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/save/handlers/FilerHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FilerHandler.java	2001/08/16 18:17:56	1.4
  +++ FilerHandler.java	2001/11/23 16:09:15	1.5
  @@ -25,22 +25,40 @@
   
   	public void save(Saveable saveObject, Writer out) throws java.io.IOException
   	{
  -		Filer save = (Filer)saveObject;
  -		out.write("<Filer type=\"");
  -		out.write(JMeterHandler.convertToXML(save.getClass().getName()));
  -		out.write("\" name=\"");
  -		out.write(JMeterHandler.convertToXML(save.getName()));
  -		out.write("\" verbose=\"");
  -		out.write(""+save.getVerbose());
  -		out.write("\" append=\"");
  -		out.write(""+save.getAppend());
  -                out.write("\" autoFlush=\"");
  -                out.write("" + save.getAutoFlush());
  -                out.write("\" viewSubmitData=\"");
  -                out.write("" + save.getViewSubmitData());
  -		out.write("\" file=\"");
  -		out.write(JMeterHandler.convertToXML(save.getFile()));
  -		out.write("\"/>");
  + 		// protect ourselves from bad input.
  +		if ((saveObject == null) || (out == null))
  +		{
  +			// error!
  +		}
  +		else
  +		{
  +	 		Filer save = (Filer)saveObject;
  +
  +			// validate filename
  +			String filename = save.getFile();
  +			if (filename == null)
  +			{
  +				System.err.println("Error. Missing filename in File Reporter.");
  +			}
  +			else
  +			{
  +				out.write("<Filer type=\"");
  +				out.write(JMeterHandler.convertToXML(save.getClass().getName()));
  +				out.write("\" name=\"");
  +				out.write(JMeterHandler.convertToXML(save.getName()));
  +				out.write("\" verbose=\"");
  +				out.write(""+save.getVerbose());
  +				out.write("\" append=\"");
  +				out.write(""+save.getAppend());
  +				out.write("\" autoFlush=\"");
  +				out.write("" + save.getAutoFlush());
  +				out.write("\" viewSubmitData=\"");
  +				out.write("" + save.getViewSubmitData());
  +				out.write("\" file=\"");
  +				out.write(JMeterHandler.convertToXML(filename));
  +				out.write("\"/>");
  +			}
  +		}
   	}
   
   	public void setAtts(Attributes atts) throws java.lang.Exception
  @@ -70,4 +88,4 @@
   	{
   		return model;
   	}
  -}
  \ No newline at end of file
  +}
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>