svn commit: r481872 - in /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter: extractor/BeanShellPostProcessor.java modifiers/BeanShellPreProcessor.java

[sebb]

Author: sebb
Date: Sun Dec  3 12:05:14 2006
New Revision: 481872

URL: http://svn.apache.org/viewvc?view=rev&rev=481872
Log:
Better behaviour when BeanShell jar is missing
Update serialVerId

Modified:
    
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
    
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=481872&r1=481871&r2=481872
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Dec  3 12:05:14 2006
@@ -35,7 +35,7 @@
 public class BeanShellPostProcessor extends AbstractTestElement implements 
PostProcessor, Serializable, TestBean {
     private static final Logger log = LoggingManager.getLoggerForClass();
     
-    private static final long serialVersionUID = 2;
+    private static final long serialVersionUID = 3;
 
     private String script;
     

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?view=diff&rev=481872&r1=481871&r2=481872
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 Sun Dec  3 12:05:14 2006
@@ -36,7 +36,7 @@
 public class BeanShellPreProcessor extends AbstractTestElement implements 
PreProcessor, Serializable, TestBean {
     private static final Logger log = LoggingManager.getLoggerForClass();
     
-    private static final long serialVersionUID = 2;
+    private static final long serialVersionUID = 3;
 
     private String script;
     
@@ -54,7 +54,7 @@
                try {
                        bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
                } catch (ClassNotFoundException e) {
-                       log.error(e.getLocalizedMessage());
+                       log.error("Cannot find BeanShell: 
"+e.getLocalizedMessage());
                }
        }
 
@@ -64,6 +64,9 @@
     }
 
     public void process(){
+        if (bshInterpreter == null) {
+            return;
+        }
         JMeterContext jmctx = JMeterContextService.getContext();
         JMeterVariables vars = jmctx.getVariables();
                Sampler sam = jmctx.getCurrentSampler();



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