kcassell 2003/03/26 12:51:20
Modified: src/core/org/apache/jmeter/save SaveServiceConstants.java
SaveService.java
Log:
SaveService properties no longer have to come from jmeter.properties.
Also, fixed potential NullPointerException
Revision Changes Path
1.5 +2 -7
jakarta-jmeter/src/core/org/apache/jmeter/save/SaveServiceConstants.java
Index: SaveServiceConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveServiceConstants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveServiceConstants.java 6 Feb 2003 14:24:31 -0000 1.4
+++ SaveServiceConstants.java 26 Mar 2003 20:51:20 -0000 1.5
@@ -74,11 +74,6 @@
// PROPERTY FILE CONSTANTS
// ---------------------------------------------------------------------
- /** The file containing the properties governing the information to
- be saved. **/
- public static final String PROPS_FILE =
- "jmeter.properties";
-
/** Indicates that the results file should be in XML format. **/
public static final String XML = "xml";
1.18 +5 -5 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SaveService.java 11 Mar 2003 19:04:18 -0000 1.17
+++ SaveService.java 26 Mar 2003 20:51:20 -0000 1.18
@@ -201,11 +201,11 @@
try
{
- props = JMeterUtils.getProperties(PROPS_FILE);
+ props = JMeterUtils.getJMeterProperties();
}
catch (Exception e)
{
- log.error("SaveService.readProperties: Problem loading properties file
" + PROPS_FILE, e);
+ log.error("SaveService.readProperties: Problem loading properties file:
", e);
}
printFieldNames =
@@ -696,7 +696,7 @@
String message = null;
AssertionResult[] results = sample.getAssertionResults();
- if (results.length > 0)
+ if ((results != null) && (results.length > 0))
{
message = results[0].getFailureMessage();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
