cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1127176 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Date Tue, 24 May 2011 17:41:52 GMT
Author: dkulp
Date: Tue May 24 17:41:52 2011
New Revision: 1127176

URL: http://svn.apache.org/viewvc?rev=1127176&view=rev
Log:
Merged revisions 1104480 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1104480 | dkulp | 2011-05-17 15:22:28 -0400 (Tue, 17 May 2011) | 1 line
  
  Fix the mock to work with the IBM JDK
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=1127176&r1=1127175&r2=1127176&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Tue May 24 17:41:52 2011
@@ -238,6 +238,8 @@ public class HTTPConduitURLEasyMockTest 
         EasyMock.expectLastCall().andReturn(true);
         exchange.isSynchronous();
         EasyMock.expectLastCall().andReturn(true);
+        exchange.isEmpty();
+        EasyMock.expectLastCall().andReturn(true).anyTimes();
     }
     
     private HTTPConduit setUpConduit(boolean send, boolean autoRedirect) throws Exception
{



Mime
View raw message