Author: gatfora
Date: Fri Dec 22 03:47:43 2006
New Revision: 489630

URL: http://svn.apache.org/viewvc?view=rev&rev=489630
Log:
Throw an error if a message is sent to a timed out sequence

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=489630&r1=489629&r2=489630
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
 Fri Dec 22 03:47:43 2006
@@ -42,6 +42,7 @@
        public static final String sendMsgError="sendMsgError";
        public static final String 
cannotSendMsgAsSequenceClosed="cannotSendMsgAsSequenceClosed";
        public static final String 
cannotSendMsgAsSequenceTerminated="cannotSendMsgAsSequenceTerminated";
+       public static final String 
cannotSendMsgAsSequenceTimedout="cannotSendMsgAsSequenceTimedout";
        public static final String noValidSyncResponse="noValidSyncResponse";
        public static final String generalError="generalError";
        public static final String classLoaderNotFound="classLoaderNotFound";
@@ -281,6 +282,6 @@
        public final static String 
couldNotSendCloseResponse="couldNotSendCloseResponse";
        public final static String 
couldNotSendCloseSeqNotFound="couldNotSendCloseSeqNotFound";
        
-    public final static String couldNotLoadModulePolicies = 
"couldNotLoadModulePolicies";
-    public final static String modulePoliciesLoaded = "modulePoliciesLoaded";
+       public final static String couldNotLoadModulePolicies = 
"couldNotLoadModulePolicies";
+       public final static String modulePoliciesLoaded = 
"modulePoliciesLoaded";
 }

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=489630&r1=489629&r2=489630
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
 Fri Dec 22 03:47:43 2006
@@ -42,6 +42,7 @@
 sendMsgError=Sandesha2 got an exception when sending a message: {0}
 cannotSendMsgAsSequenceClosed=Sandesha2 could not send the message on sequence 
{0} as the sequence has been closed.
 cannotSendMsgAsSequenceTerminated=Sandesha2 could not send the message on 
sequence {0} as the sequence has been terminated.
+cannotSendMsgAsSequenceTimedout=Sandesha2 could not send the message on 
sequence {0} as the sequence has timed out.
 noValidSyncResponse=Sandesha2 sender thread has not received a valid 
synchronous response...
 generalError=Sandesha2 Internal Error: sandesha2 encountered the following 
exception {0}
 classLoaderNotFound=Module class loader not found.

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=489630&r1=489629&r2=489630
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
 Fri Dec 22 03:47:43 2006
@@ -231,6 +231,12 @@
                        throw new 
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotSendMsgAsSequenceTerminated,
 internalSequenceId));
                }
 
+               //see if the sequence is timed out
+               SequencePropertyBean sequenceTimedout = 
seqPropMgr.retrieve(sequencePropertyKey, 
Sandesha2Constants.SequenceProperties.SEQUENCE_TIMED_OUT);
+               if(sequenceTimedout!=null){
+                       throw new 
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotSendMsgAsSequenceTimedout,
 internalSequenceId));
+               }
+
                // saving the used message number
                if (!dummyMessage)
                        setNextMsgNo(configContext, sequencePropertyKey, 
messageNumber, storageManager);



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

Reply via email to