cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1463986 - in /cxf/branches/2.5.x-fixes: ./ rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
Date Wed, 03 Apr 2013 12:56:50 GMT
Author: ay
Date: Wed Apr  3 12:56:50 2013
New Revision: 1463986

URL: http://svn.apache.org/r1463986
Log:
Merged revisions 1463978 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1463978 | ay | 2013-04-03 14:50:45 +0200 (Wed, 03 Apr 2013) | 17 lines
  
  Merged revisions 1463976 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ........
    r1463976 | ay | 2013-04-03 14:47:36 +0200 (Wed, 03 Apr 2013) | 9 lines
    
    Merged revisions 1463972 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1463972 | ay | 2013-04-03 14:43:51 +0200 (Wed, 03 Apr 2013) | 1 line
      
      fix NPE at ws.rm.DestinationSequenceTest
    ........
    
  ........
  
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java?rev=1463986&r1=1463985&r2=1463986&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
Wed Apr  3 12:56:50 2013
@@ -638,7 +638,7 @@ public class DestinationSequenceTest ext
         DestinationSequence seq = new DestinationSequence(id, ref, destination,
             ProtocolVariation.RM10WSA200408);
         RMEndpoint rme = control.createMock(RMEndpoint.class);
-        EasyMock.expect(destination.getReliableEndpoint()).andReturn(rme);
+        EasyMock.expect(destination.getReliableEndpoint()).andReturn(rme).anyTimes();
         DestinationSequence.SequenceTermination st = seq.new SequenceTermination();
         st.updateInactivityTimeout(30000L);
         long lastAppMessage = System.currentTimeMillis() - 1000L;



Mime
View raw message