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/05/23 22:37:46 UTC
svn commit: r1342040 - in
/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm:
RMInInterceptor.java RMManager.java RMOutInterceptor.java
soap/RMSoapInterceptor.java
Author: dkulp
Date: Wed May 23 20:37:45 2012
New Revision: 1342040
URL: http://svn.apache.org/viewvc?rev=1342040&view=rev
Log:
Better way to make sure no warnings logged when the RM stuff doesn't
really need or expect to have addressing maps
Modified:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=1342040&r1=1342039&r2=1342040&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Wed May 23 20:37:45 2012
@@ -65,7 +65,7 @@ public class RMInInterceptor extends Abs
// message addressing properties may be null, e.g. in case of a runtime fault
// on the server side
- final AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
+ final AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
if (null == maps) {
return;
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=1342040&r1=1342039&r2=1342040&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Wed May 23 20:37:45 2012
@@ -48,7 +48,6 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.InterfaceInfo;
@@ -349,8 +348,7 @@ public class RMManager {
public String getAddressingNamespace(Message message) {
String addrUri = (String)message.getContextualProperty(WSRM_WSA_VERSION_PROPERTY);
if (addrUri == null) {
- boolean out = MessageUtils.isOutbound(message);
- AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, out);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
if (maps != null) {
addrUri = maps.getNamespaceURI();
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=1342040&r1=1342039&r2=1342040&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Wed May 23 20:37:45 2012
@@ -67,7 +67,7 @@ public class RMOutInterceptor extends Ab
return;
}
- AddressingProperties maps = RMContextUtils.retrieveMAPs(msg, false, true);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(msg, false, true, false);
if (null == maps) {
LogUtils.log(LOG, Level.WARNING, "MAPS_RETRIEVAL_FAILURE_MSG");
return;
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1342040&r1=1342039&r2=1342040&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Wed May 23 20:37:45 2012
@@ -61,6 +61,7 @@ import org.apache.cxf.service.model.Bind
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.soap.MAPCodec;
import org.apache.cxf.ws.rm.AbstractRMInterceptor;
import org.apache.cxf.ws.rm.EncoderDecoder;
@@ -275,7 +276,7 @@ public class RMSoapInterceptor extends A
if (rmUri != null && rmUri.equals(ns)) {
if (codec == null) {
String wsauri = null;
- AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
if (maps == null) {
wsauri = getManager(message).getAddressingNamespace(message);
} else {
@@ -342,7 +343,7 @@ public class RMSoapInterceptor extends A
*/
private void updateServiceModelInfo(SoapMessage message) throws Fault {
- AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
AttributedURIType actionURI = null == maps ? null : maps.getAction();
String action = null == actionURI ? null : actionURI.getValue().trim();