You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/11/04 01:12:05 UTC
svn commit: r471063 - in
/webservices/sandesha/trunk/java/src/org/apache/sandesha2:
handlers/SandeshaInHandler.java msgprocessors/ApplicationMsgProcessor.java
msgreceivers/RMMessageReceiver.java util/SandeshaUtil.java
Author: chamikara
Date: Fri Nov 3 16:12:04 2006
New Revision: 471063
URL: http://svn.apache.org/viewvc?view=rev&rev=471063
Log:
Applied the patches from Andrew on Sandesha2-39 and Sandesha2-40.
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?view=diff&rev=471063&r1=471062&r2=471063
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java Fri Nov 3 16:12:04 2006
@@ -134,7 +134,9 @@
returnValue = InvocationResponse.SUSPEND;
}
- } catch (AxisFault e) {
+ } catch (Exception e) {
+ if (log.isDebugEnabled())
+ log.debug("Exception caught during processInMessage", e);
// message should not be sent in a exception situation.
msgCtx.pause();
returnValue = InvocationResponse.SUSPEND;
@@ -149,9 +151,11 @@
log.debug(message, e);
}
}
-
- throw e;
- } finally {
+
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.inMsgError, e.toString());
+ throw new AxisFault(message, e);
+ }
+ finally {
if (!withinTransaction && !rolebacked) {
try {
transaction.commit();
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=471063&r1=471062&r2=471063
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Fri Nov 3 16:12:04 2006
@@ -521,8 +521,11 @@
MessageContext createSeqMsg = createSeqRMMessage.getMessageContext();
createSeqMsg.setRelationships(null); // create seq msg does not
// relateTo anything
-
- String createSequenceMessageStoreKey = SandeshaUtil.getUUID(); // the key taht will be used to store
+
+ // Set that the create sequence message is part of a transaction.
+ createSeqMsg.setProperty(Sandesha2Constants.WITHIN_TRANSACTION, Sandesha2Constants.VALUE_TRUE);
+
+ String createSequenceMessageStoreKey = SandeshaUtil.getUUID(); // the key that will be used to store
//the create sequence message.
CreateSeqBean createSeqBean = new CreateSeqBean();
@@ -539,7 +542,7 @@
//TODO set the replyTo of CreateSeq (and others) to Anymomous if Application Msgs hv it as Anonymous.
-// //checking weather the sequence is in polling mode.
+// //checking whether the sequence is in polling mode.
// boolean pollingMode = false;
// EndpointReference replyTo = applicationRMMsg.getReplyTo();
// if (replyTo!=null && SandeshaUtil.isWSRMAnonymousReplyTo(replyTo.getAddress()))
@@ -577,6 +580,8 @@
createSeqEntry.setInternalSequenceID(sequencePropertyKey);
// this will be set to true in the sender
createSeqEntry.setSend(true);
+ // Indicate that this message is a create sequence
+ createSeqEntry.setMessageType(Sandesha2Constants.MessageTypes.CREATE_SEQ);
EndpointReference to = createSeqRMMessage.getTo();
if (to!=null)
createSeqEntry.setToAddress(to.getAddress());
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java?view=diff&rev=471063&r1=471062&r2=471063
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java Fri Nov 3 16:12:04 2006
@@ -44,7 +44,7 @@
public class RMMessageReceiver extends AbstractMessageReceiver {
- private static final Log log = LogFactory.getLog(RMMessageReceiver.class.getName());
+ private static final Log log = LogFactory.getLog(RMMessageReceiver.class);
public final void receive(MessageContext msgCtx) throws AxisFault {
if(log.isDebugEnabled()) log.debug("Entry: RMMessageReceiver::receive");
@@ -66,7 +66,8 @@
Transaction transaction = null;
if (!withinTransaction) {
ConfigurationContext context = msgCtx.getConfigurationContext();
- StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(context, context.getAxisConfiguration()); transaction = storageManager.getTransaction();
+ StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(context, context.getAxisConfiguration());
+ transaction = storageManager.getTransaction();
msgCtx.setProperty(Sandesha2Constants.WITHIN_TRANSACTION, Sandesha2Constants.VALUE_TRUE);
}
@@ -76,7 +77,9 @@
msgProcessor.processInMessage(rmMsgCtx);
- } catch (AxisFault e) {
+ } catch (Exception e) {
+ if (log.isDebugEnabled())
+ log.debug("Exception caught during processInMessage", e);
// message should not be sent in a exception situation.
msgCtx.pause();
@@ -91,7 +94,8 @@
}
}
- throw e;
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.inMsgError, e.toString());
+ throw new AxisFault(message, e);
} finally {
if (!withinTransaction && !rolledBack) {
try {
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=471063&r1=471062&r2=471063
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Fri Nov 3 16:12:04 2006
@@ -1040,6 +1040,8 @@
}
public static void executeAndStore (RMMsgContext rmMsgContext, String storageKey) throws AxisFault {
+ if (log.isDebugEnabled())
+ log.debug("Enter: SandeshaUtil::executeAndStore, " + storageKey);
MessageContext msgContext = rmMsgContext.getMessageContext();
ConfigurationContext configurationContext = msgContext.getConfigurationContext();
@@ -1064,6 +1066,8 @@
else
engine.send(msgContext);
+ if (log.isDebugEnabled())
+ log.debug("Exit: SandeshaUtil::executeAndStore");
}
public static void modifyExecutionChainForStoring (MessageContext message) {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org