You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by dk...@apache.org on 2012/09/11 20:54:30 UTC

svn commit: r1383549 - /cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java

Author: dkulp
Date: Tue Sep 11 18:54:30 2012
New Revision: 1383549

URL: http://svn.apache.org/viewvc?rev=1383549&view=rev
Log:
Merged revisions 1383528 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1383528 | dkulp | 2012-09-11 14:39:15 -0400 (Tue, 11 Sep 2012) | 10 lines

  Merged revisions 1382104 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1382104 | dkulp | 2012-09-07 13:56:55 -0400 (Fri, 07 Sep 2012) | 2 lines

    Forgot to update the request counts for the proxies

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java

Modified: cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java?rev=1383549&r1=1383548&r2=1383549&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java Tue Sep 11 18:54:30 2012
@@ -320,7 +320,7 @@ public class HTTPConduitTest extends Abs
         answer = mortimer.sayHi();
         assertTrue("Unexpected answer: " + answer, 
                 "Bonjour from Mortimer".equals(answer));
-        assertProxyRequestCount(1);
+        assertProxyRequestCount(3);
     }
 
     @Test