You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ga...@apache.org on 2007/03/29 12:37:06 UTC

svn commit: r523666 - in /webservices/sandesha/trunk/java/src/org/apache/sandesha2/util: FaultManager.java SOAPFaultEnvelopeCreator.java

Author: gatfora
Date: Thu Mar 29 03:37:05 2007
New Revision: 523666

URL: http://svn.apache.org/viewvc?view=rev&rev=523666
Log:
Axiom changes have caused exceptions when generating fault RM messags, this fix stops the unit test failures

Modified:
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java?view=diff&rev=523666&r1=523665&r2=523666
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java Thu Mar 29 03:37:05 2007
@@ -450,7 +450,6 @@
 		SOAPFaultReason reason = factory.createSOAPFaultReason();
 		SOAPFaultText reasonText = factory.createSOAPFaultText();
 		reasonText.setText(data.getReason());
-		reason.addSOAPText(reasonText);
 		
 		SOAPFaultDetail detail = factory.createSOAPFaultDetail();
 		detail.addDetailEntry(data.getDetail());
@@ -458,11 +457,12 @@
 		String SOAPNamespaceValue = factory.getSoapVersionURI();
 		
 		if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(SOAPNamespaceValue)) {
+			reason.addSOAPText(reasonText);
 			referenceRMMsgContext.setProperty(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, faultCode);
 			referenceRMMsgContext.setProperty(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, reason);
 			referenceRMMsgContext.setProperty(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME, detail);
 		} else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals (SOAPNamespaceValue)) {
-			
+			reason.setText(data.getReason());
 			referenceRMMsgContext.setProperty(SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME, faultCode);
 			referenceRMMsgContext.setProperty(SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME, detail);
 			referenceRMMsgContext.setProperty(SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME, reason);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java?view=diff&rev=523666&r1=523665&r2=523666
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java Thu Mar 29 03:37:05 2007
@@ -150,14 +150,7 @@
 				.getSOAPVersion(faultMsgEnvelope));
 
 		SOAPFault fault = faultMsgEnvelope.getBody().getFault();
-		
-		// Set the faultcode
-		SOAPFaultCode faultCode = fault.getCode();
-		faultCode.getValue().setText(data.getCode());
-			
-		// Set the faultstring
-		fault.getReason().getFirstSOAPText().setText(data.getReason());
-		
+
 		if (data.getExceptionString() != null)
 			fault.getDetail().setText(data.getExceptionString());
 		
@@ -166,7 +159,6 @@
 			addSequenceFaultHeader(faultMsgContext, data, factory, rmNamespaceValue);
 
 	}
-
 	
 	/**
 	 * Building the envelope with SOAP 1.2



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org