You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/01/30 19:21:18 UTC

svn commit: r1727742 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java xdocs/changes.xml

Author: pmouawad
Date: Sat Jan 30 18:21:18 2016
New Revision: 1727742

URL: http://svn.apache.org/viewvc?rev=1727742&view=rev
Log:
Bug 58947 - Connect metric is wrong when ConnectException occurs
Bugzilla Id: 58947

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java?rev=1727742&r1=1727741&r2=1727742&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java Sat Jan 30 18:21:18 2016
@@ -106,9 +106,12 @@ public class MeasuringConnectionManager
 
         @Override
         public void open(HttpRoute route, HttpContext context, HttpParams params) throws IOException {
-            handler.open(route, context, params);
-            if (sample != null) {
-                sample.connectEnd();
+            try {
+                handler.open(route, context, params);
+            } finally {
+                if (sample != null) {
+                    sample.connectEnd();
+                }
             }
         }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1727742&r1=1727741&r2=1727742&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Jan 30 18:21:18 2016
@@ -240,6 +240,7 @@ Summary
     <li><bug>58209</bug>JMeter hang when testing javasampler because HashMap.put() is called from multiple threads without sync.</li>
     <li><bug>58301</bug>Use typed methods such as setInt, setDouble, setDate ... for prepared statement #27</li>
     <li><bug>58851</bug>Add a dependency to hamcrest-core to allow JUnit tests with annotations to work</li>
+    <li><bug>58947</bug>Connect metric is wrong when ConnectException occurs</li>
 </ul>
 
 <h3>Controllers</h3>