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/02/15 02:44:57 UTC
svn commit: r377916 -
/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/IncludeController.java
Author: sebb
Date: Tue Feb 14 17:44:56 2006
New Revision: 377916
URL: http://svn.apache.org/viewcvs?rev=377916&view=rev
Log:
Revert previous change as it did nothing; add filename to log
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/IncludeController.java
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/IncludeController.java?rev=377916&r1=377915&r2=377916&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/IncludeController.java Tue Feb 14 17:44:56 2006
@@ -23,7 +23,6 @@
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
@@ -75,7 +74,7 @@
* @param jmxfile
*/
public void setIncludePath(String jmxfile) {
- this.setProperty(new StringProperty(INCLUDE_PATH,jmxfile));
+ this.setProperty(INCLUDE_PATH,jmxfile);
}
/**
@@ -100,10 +99,11 @@
*/
protected HashTree loadIncludedElements() {
// only try to load the JMX test plan if there is one
- if (getIncludePath() != null && getIncludePath().length() > 0) {
+ final String includePath = getIncludePath();
+ if (includePath != null && includePath.length() > 0) {
try {
- log.info("loadIncludedElements -- try to load included module");
- InputStream reader = new FileInputStream(getIncludePath());
+ log.info("loadIncludedElements -- try to load included module: "+includePath);
+ InputStream reader = new FileInputStream(includePath);
this.SUBTREE = SaveService.loadTree(reader);
return this.SUBTREE;
} catch (NoClassDefFoundError ex) // Allow for missing optional jars
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org