Author: dkulp Date: Fri Dec 21 15:22:58 2012 New Revision: 1424964 URL: http://svn.apache.org/viewvc?rev=1424964&view=rev Log: Merged revisions 1424957 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1424957 | dkulp | 2012-12-21 10:20:16 -0500 (Fri, 21 Dec 2012) | 10 lines Merged revisions 1424950 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1424950 | dkulp | 2012-12-21 10:17:10 -0500 (Fri, 21 Dec 2012) | 2 lines Fix test ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java?rev=1424964&r1=1424963&r2=1424964&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java Fri Dec 21 15:22:58 2012 @@ -148,7 +148,7 @@ public class PolicyVerificationInInterce if (setupBindingOperationInfo && null == boi) { boi = control.createMock(BindingOperationInfo.class); } - EasyMock.expect(exchange.get(BindingOperationInfo.class)).andReturn(boi); + EasyMock.expect(exchange.getBindingOperationInfo()).andReturn(boi); if (!setupBindingOperationInfo) { return; }
