sebb        2003/10/30 04:20:50

  Modified:    src/core/org/apache/jmeter/util BeanShellServer.java
  Log:
  Improved error reporting
  
  Revision  Changes    Path
  1.2       +10 -6     
jakarta-jmeter/src/core/org/apache/jmeter/util/BeanShellServer.java
  
  Index: BeanShellServer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/BeanShellServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanShellServer.java      29 Oct 2003 13:57:41 -0000      1.1
  +++ BeanShellServer.java      30 Oct 2003 12:20:49 -0000      1.2
  @@ -58,7 +58,6 @@
   import java.lang.reflect.InvocationTargetException;
   import java.lang.reflect.Method;
   
  -import org.apache.jmeter.util.JMeterUtils;
   import org.apache.jorphan.logging.LoggingManager;
   import org.apache.log.Logger;
   
  @@ -122,16 +121,21 @@
                        Method setInt = Interpreter.getMethod(
                                        "set",
                                        new Class[] {string,int.class});
  +                     Method source =
  +                             Interpreter.getMethod(
  +                                     "source",
  +                                     new Class[] {string});
                        
                        setObj.invoke(instance, new Object[] { "t",this });
                        setInt.invoke(instance, new Object[] { "portnum",new 
Integer(serverport) });
  -                     eval.invoke(instance, new Object[]{"setAccessibility(true)"});
  +
                        if (serverfile.length() > 0 ){
  -                             setObj.invoke(instance, new Object[] { 
"serverfile",serverfile });
                                try {
  -                                     eval.invoke(instance, new 
Object[]{"source(serverfile)"});
  +                                     source.invoke(instance, new 
Object[]{serverfile});
                                } catch (InvocationTargetException e1) {
  -                                     log.warn("Could not evaluate "+serverfile);
  +                                     log.warn("Could not source "+serverfile);
  +                                     Throwable t= e1.getCause();
  +                                     if (t != null) log.warn(t.toString());
                                }
                        }
                        eval.invoke(instance, new Object[]{"server(portnum)"});
  
  
  

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

Reply via email to