svn commit: r545957 - in /jakarta/jmeter/branches/rel-2-2/src: components/org/apache/jmeter/assertions/BeanShellAssertion.java functions/org/apache/jmeter/functions/BeanShell.java protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java

[sebb]

Author: sebb
Date: Sun Jun 10 15:34:24 2007
New Revision: 545957

URL: http://svn.apache.org/viewvc?view=rev&rev=545957
Log:
Oops - need to retrieve the property value ...

Modified:
    
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
    
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
    
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?view=diff&rev=545957&r1=545956&r2=545957
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 Sun Jun 10 15:34:24 2007
@@ -67,7 +67,7 @@
 
        private void init(){
                try {
-                       bshInterpreter = new BeanShellInterpreter(INIT_FILE, 
log);
+                       bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);
                } catch (ClassNotFoundException e) {
                        log.error("Cannot find BeanShell: "+e.toString());
                }               

Modified: 
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java?view=diff&rev=545957&r1=545956&r2=545957
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
 Sun Jun 10 15:34:24 2007
@@ -151,7 +151,7 @@
                }
 
                try {
-                       bshInterpreter = new BeanShellInterpreter(INIT_FILE, 
log);
+                       bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);
                } catch (ClassNotFoundException e) {
                        throw new InvalidVariableException("BeanShell not 
found");
                }

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java?view=diff&rev=545957&r1=545956&r2=545957
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
 Sun Jun 10 15:34:24 2007
@@ -57,7 +57,7 @@
 
        public BeanShellSampler() {
                try {
-                       bshInterpreter = new BeanShellInterpreter(INIT_FILE, 
log);
+                       bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);
                } catch (ClassNotFoundException e) {
                        log.error("Cannot find BeanShell: "+e.toString());
                }



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