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 se...@apache.org on 2006/05/05 03:10:34 UTC
svn commit: r399906 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
Author: sebb
Date: Thu May 4 18:10:33 2006
New Revision: 399906
URL: http://svn.apache.org/viewcvs?rev=399906&view=rev
Log:
Protect against NPE with empty filename
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java?rev=399906&r1=399905&r2=399906&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java Thu May 4 18:10:33 2006
@@ -203,9 +203,10 @@
ComponentUtil.centerComponentInWindow(main, 80);
main.show();
ActionRouter.getInstance().actionPerformed(new ActionEvent(main, 1, ActionNames.ADD_ALL));
- if (testFile != null) {
+ String arg;
+ if (testFile != null && (arg = testFile.getArgument()) != null) {
try {
- File f = new File(testFile.getArgument());
+ File f = new File(arg);
log.info("Loading file: " + f);
FileInputStream reader = new FileInputStream(f);
HashTree tree = SaveService.loadTree(reader);
@@ -492,10 +493,14 @@
if (testFile == null) {
throw new IllegalUserActionException();
}
- if (logFile == null) {
- driver.run(testFile.getArgument(), null, remoteStart != null);
+ String argument = testFile.getArgument();
+ if (argument == null) {
+ throw new IllegalUserActionException();
+ }
+ if (logFile == null) {
+ driver.run(argument, null, remoteStart != null);
} else {
- driver.run(testFile.getArgument(), logFile.getArgument(), remoteStart != null);
+ driver.run(argument, logFile.getArgument(), remoteStart != null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org