svn commit: r677209 - in /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util: FaultManager.java MsgInitializer.java

Author: mckierna
Date: Wed Jul 16 02:22:14 2008
New Revision: 677209

URL: http://svn.apache.org/viewvc?rev=677209&view=rev
Log:
See https://issues.apache.org/jira/browse/SANDESHA2-167

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java?rev=677209&r1=677208&r2=677209&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java Wed Jul 16 02:22:14 2008
@@ -46,6 +46,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.engine.Handler.InvocationResponse;
@@ -887,9 +888,20 @@
 
 		ConfigurationContext configCtx = rmMsgCtx.getMessageContext().getConfigurationContext();
 		
-		if(log.isWarnEnabled())
-			log.warn(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reliableMessagingNotEnabled, rmMsgCtx.getMessageContext().getAxisService().getName()));
-
+		if(log.isWarnEnabled()){
+			String name = "NOT_SET";
+			if(rmMsgCtx != null){
+				MessageContext mCtx = rmMsgCtx.getMessageContext();
+				if(mCtx != null){
+					AxisService axisSvc = mCtx.getAxisService();
+					if(axisSvc != null){
+						name = axisSvc.getName();
+					}
+				}
+			}
+			log.warn(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reliableMessagingNotEnabled, name));
+		}
+			
 		StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx, configCtx
 				.getAxisConfiguration());
 

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java?rev=677209&r1=677208&r2=677209&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java Wed Jul 16 02:22:14 2008
@@ -74,12 +74,7 @@
 	 */
 	private static void populateRMMsgContext(MessageContext msgCtx, RMMsgContext rmMsgContext) throws AxisFault {
 
-		// if client side and the addressing version is not set. assuming the
-		// default addressing version
-		String addressingNamespace = (String) msgCtx.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
-		if (addressingNamespace == null && !msgCtx.isServerSide())
-			addressingNamespace = AddressingConstants.Final.WSA_NAMESPACE;
-
+	
 		rmMsgContext.fromSOAPEnvelope(msgCtx.getEnvelope(), msgCtx.getWSAAction());
 
 		String sequenceID = null;