sebb        2005/03/18 16:33:37

  Modified:    src/components/org/apache/jmeter/assertions
                        BeanShellAssertion.java
  Log:
  log is defined earlier
  
  Revision  Changes    Path
  1.9       +5 -7      
jakarta-jmeter/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
  
  Index: BeanShellAssertion.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BeanShellAssertion.java   18 Mar 2005 15:26:53 -0000      1.8
  +++ BeanShellAssertion.java   19 Mar 2005 00:33:37 -0000      1.9
  @@ -38,7 +38,7 @@
   public class BeanShellAssertion extends AbstractTestElement
       implements Serializable, Assertion
   {
  -     protected static final Logger log = LoggingManager.getLoggerForClass();
  +     private static Logger log = LoggingManager.getLoggerForClass();
   
       public static final String FILENAME   = "BeanShellAssertion.filename"; 
//$NON-NLS-1$
        public static final String SCRIPT     = "BeanShellAssertion.query"; 
//$NON-NLS-1$
  @@ -100,14 +100,12 @@
                String request=getScript();
                String fileName=getFilename();
                
  -             // Has to be done after construction, otherwise fails 
serialisation check
  -             bshInterpreter.set("log",log);  //$NON-NLS-1$
  -                     
                bshInterpreter.set("FileName",getFilename());//$NON-NLS-1$
                        bshInterpreter.set("Parameters",getParameters());// as 
a single line $NON-NLS-1$
                        bshInterpreter.set("bsh.args",//$NON-NLS-1$
                                        JOrphanUtils.split(getParameters()," 
"));//$NON-NLS-1$
  -                     
  +
  +                     // Add SamplerData for consistency with BeanShell 
Sampler
                        bshInterpreter.set("SampleResult",response);// Raw 
access to the response //$NON-NLS-1$
                        bshInterpreter.set("Response",response);// Raw access 
to the response //$NON-NLS-1$
                        
bshInterpreter.set("ResponseData",response.getResponseData());//$NON-NLS-1$
  
  
  

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

Reply via email to