svn commit: r676855 - in /webservices/sandesha/trunk/java/modules/core/src/main: java/org/apache/sandesha2/i18n/ java/org/apache/sandesha2/msgprocessors/ java/org/apache/sandesha2/util/ resources/org/apache/sandesha2/i18n/

Author: mckierna
Date: Tue Jul 15 03:03:22 2008
New Revision: 676855

URL: http://svn.apache.org/viewvc?rev=676855&view=rev
Log:
cSeqRefused improvements

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
    webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?rev=676855&r1=676854&r2=676855&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java Tue Jul 15 03:03:22 2008
@@ -244,5 +244,6 @@
 	public final static String noPollingProtocol="noPollingProtocol";
 	public final static String freeingTransport="freeingTransport";
 	public final static String couldNotSendFaultDueToException="couldNotSendFaultDueToException";
+	public final static String acksToInvalid="acksToInvalid";
 
 }

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=676855&r1=676854&r2=676855&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Tue Jul 15 03:03:22 2008
@@ -137,13 +137,18 @@
 					TerminateManager.addTerminateSequenceMessage(requestSideRefRMMessage, rmsBean.getInternalSequenceID(), rmsBean.getSequenceID(), storageManager);
 				}
 			}
-				
 
 			MessageContext outMessage = null;
 	
 			// Create the new sequence id, as well as establishing the beans that handle the
 			// sequence state.
 			RMDBean rmdBean = SequenceManager.setupNewSequence(createSeqRMMsg, storageManager, secManager, token);
+			if(rmdBean==null){
+				// This did not work. Return false if an Exception hasn't been thrown.
+				if (log.isDebugEnabled())
+					log.debug("Exit: CreateSeqMsgProcessor::processInMessage " + Boolean.FALSE);				
+				return false;
+			}
 				
 			RMMsgContext createSeqResponse = RMMsgCreator.createCreateSeqResponseMsg(createSeqRMMsg, rmdBean);
 			outMessage = createSeqResponse.getMessageContext();

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java?rev=676855&r1=676854&r2=676855&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java Tue Jul 15 03:03:22 2008
@@ -88,9 +88,13 @@
 		EndpointReference acksTo = createSequence.getAcksTo().getEPR();
 
 		if (acksTo == null) {
+			log.error(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.acksToInvalid, ""));
 			FaultManager.makeCreateSequenceRefusedFault(createSequenceMsg, SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noAcksToPartInCreateSequence), new Exception(), null);
+			return null;
 		} else if (acksTo.getAddress().equals(AddressingConstants.Final.WSA_NONE_URI)){
+			log.error(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.acksToInvalid, acksTo.getAddress()));
 			FaultManager.makeCreateSequenceRefusedFault(createSequenceMsg, "AcksTo can not be " + AddressingConstants.Final.WSA_NONE_URI, new Exception(), null);
+			return null;
 		}
 
 		MessageContext createSeqContext = createSequenceMsg.getMessageContext();

Modified: webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?rev=676855&r1=676854&r2=676855&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties Tue Jul 15 03:03:22 2008
@@ -219,6 +219,8 @@
 elementMustForSpec=Element ''{0}'' must be present for the spec ''{1}''.
 couldNotSendFaultDueToException=Could not send the fault ''{0}'' due to the exception '{1}'';
 
+acksToInvalid=The acksTo ''{0}'' is not valid.
+
 #-------------------------------------
 #
 #	Client messages