Author: dkulp Date: Wed Feb 13 17:09:09 2013 New Revision: 1445746 URL: http://svn.apache.org/r1445746 Log: Merged revisions 1445712 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1445712 | dkulp | 2013-02-13 11:26:38 -0500 (Wed, 13 Feb 2013) | 18 lines Merged revisions 1445376 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1445376 | dkulp | 2013-02-12 16:16:01 -0500 (Tue, 12 Feb 2013) | 10 lines Merged revisions 1445282 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1445282 | dkulp | 2013-02-12 12:30:09 -0500 (Tue, 12 Feb 2013) | 2 lines Properly remove the AIM so it doesn't validate against the wrong policy ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java Modified: cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java?rev=1445746&r1=1445745&r2=1445746&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java Wed Feb 13 17:09:09 2013 @@ -66,7 +66,7 @@ public class MEXInInterceptor extends Ab } if ("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get".equals(action) || "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request".equals(action)) { - message.remove(AssertionInfoMap.class); + message.remove(AssertionInfoMap.class.getName()); Exchange ex = message.getExchange(); Endpoint endpoint = createEndpoint(message); ex.put(Endpoint.class, endpoint);
