jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1335279 - in /jmeter/trunk/src: core/org/apache/jmeter/util/BeanShellServer.java protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
Date Mon, 07 May 2012 21:58:28 GMT
Author: pmouawad
Date: Mon May  7 21:58:28 2012
New Revision: 1335279

URL: http://svn.apache.org/viewvc?rev=1335279&view=rev
Log:
Bug 53136 - Catching Throwable needs to be carefully handled

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java?rev=1335279&r1=1335278&r2=1335279&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java Mon May  7 21:58:28
2012
@@ -85,6 +85,9 @@ public class BeanShellServer implements 
                     Throwable t= e1.getCause();
                     if (t != null) {
                         log.warn(t.toString());
+                        if(t instanceof Error) {
+                            throw (Error)t;
+                        }
                     }
                 }
             }

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java?rev=1335279&r1=1335278&r2=1335279&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
Mon May  7 21:58:28 2012
@@ -253,6 +253,9 @@ public class HTTPJavaImpl extends HTTPAb
                 Throwable cause = e.getCause();
                 if (cause != null){
                     log.error("Cause: "+cause);
+                    if(cause instanceof Error) {
+                        throw (Error)cause;
+                    }
                 }
             }
             // Normal InputStream is not available
@@ -276,6 +279,9 @@ public class HTTPJavaImpl extends HTTPAb
             Throwable cause = e.getCause();
             if (cause != null){
                 log.error("Cause: "+cause);
+                if(cause instanceof Error) {
+                    throw (Error)cause;
+                }
             }
             in = new BufferedInputStream(conn.getErrorStream());
         }



Mime
View raw message