Author: gatfora
Date: Fri Jan 19 10:33:38 2007
New Revision: 497897

URL: http://svn.apache.org/viewvc?view=rev&rev=497897
Log:
Ensure that a FaultMessage can be created when RM is enabled

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
    
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=497897&r1=497896&r2=497897
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java 
(original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java 
Fri Jan 19 10:33:38 2007
@@ -1114,10 +1114,12 @@
                
                if(!result) {
                        //look at the operation
-                       Parameter unreliableParam = 
mc.getAxisOperation().getParameter(SandeshaClientConstants.UNRELIABLE_MESSAGE);
-                       if (null != unreliableParam && 
"true".equals(unreliableParam.getValue())) {
-                               if (log.isDebugEnabled()) log.debug("Unreliable 
operation");
-                               result = true;
+                       if (mc.getAxisOperation() != null) {
+                               Parameter unreliableParam = 
mc.getAxisOperation().getParameter(SandeshaClientConstants.UNRELIABLE_MESSAGE);
+                               if (null != unreliableParam && 
"true".equals(unreliableParam.getValue())) {
+                                       if (log.isDebugEnabled()) 
log.debug("Unreliable operation");
+                                       result = true;
+                               }
                        }
                }
                

Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java?view=diff&rev=497897&r1=497896&r2=497897
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
 Fri Jan 19 10:33:38 2007
@@ -17,9 +17,14 @@
 
 package org.apache.sandesha2;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.sandesha2.util.Range;
 import org.apache.sandesha2.util.RangeString;
 import org.apache.sandesha2.util.SandeshaUtil;
@@ -173,7 +178,21 @@
                assertFalse(it.hasNext());
        }
        
-       
+       /**
+        * Checks that a Fault message can be created from an empty 
MessageContext
+        * 
+        * @throws Exception
+        */
+       public void testCreateFaultMessageContext() throws Exception {
+               
+               String repoPath = "target" + File.separator + "repos" + 
File.separator + "client";
+               String axis2_xml = "target" + File.separator + "repos" + 
File.separator + "client" + File.separator + "client_axis2.xml";
+               ConfigurationContext configContext = 
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml);
+               MessageContext messageContext = new MessageContext();
+               messageContext.setConfigurationContext(configContext);
+               messageContext = 
MessageContextBuilder.createFaultMessageContext(messageContext, new 
Exception());
+       }
+
        
        
        



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to