Author: sebb
Date: Sun Aug 19 10:26:54 2007
New Revision: 567435

URL: http://svn.apache.org/viewvc?view=rev&rev=567435
Log:
Detect broken connection and stop test

Modified:
    
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/StandardSampleSender.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/StandardSampleSender.java?view=diff&rev=567435&r1=567434&r2=567435
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
 Sun Aug 19 10:26:54 2007
@@ -20,6 +20,7 @@
 
 import org.apache.log.Logger;
 import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JMeterError;
 
 import java.rmi.RemoteException;
 import java.io.Serializable;
@@ -46,8 +47,8 @@
                log.info("Test ended()");
                try {
                        listener.testEnded();
-               } catch (Throwable ex) {
-                       log.warn("testEnded()", ex);
+               } catch (RemoteException ex) {
+                       log.warn("testEnded()"+ex);
                }
 
        }
@@ -56,8 +57,8 @@
                log.info("Test Ended on " + host); // should this be debug?
                try {
                        listener.testEnded(host);
-               } catch (Throwable ex) {
-                       log.error("testEnded(host)", ex);
+               } catch (RemoteException ex) {
+                       log.warn("testEnded(host)"+ex);
                }
        }
 
@@ -66,6 +67,9 @@
                try {
                        listener.sampleOccurred(e);
                } catch (RemoteException err) {
+                       if (err.getCause() instanceof 
java.net.ConnectException){
+                               throw new JMeterError("Could not return 
sample",err);                           
+                       }
                        log.error("sampleOccurred", err);
                }
        }



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

Reply via email to