Author: gatfora
Date: Fri Dec 8 05:30:22 2006
New Revision: 484592
URL: http://svn.apache.org/viewvc?view=rev&rev=484592
Log:
Make FaultManager methods throw exceptions when there is an error, not return
SandeshaExceptions
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
Fri Dec 8 05:30:22 2006
@@ -134,18 +134,11 @@
}
// Check that the sequence requested exists
- FaultManager faultManager = new FaultManager();
- SandeshaException fault =
faultManager.checkForUnknownSequence(rmMsgCtx, sequenceId, storageManager);
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForUnknownSequence(rmMsgCtx, sequenceId,
storageManager);
// Check that the sequence isn't closed
// throwing a fault if the sequence is closed.
- fault = faultManager.checkForSequenceClosed(rmMsgCtx,
sequenceId, storageManager);
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForSequenceClosed(rmMsgCtx, sequenceId,
storageManager);
// Setting the ack depending on AcksTo.
SequencePropertyBean acksToBean =
seqPropMgr.retrieve(sequencePropertyKey,
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Fri Dec 8 05:30:22 2006
@@ -134,15 +134,8 @@
Iterator ackRangeIterator =
sequenceAck.getAcknowledgementRanges().iterator();
Iterator nackIterator = sequenceAck.getNackList().iterator();
- FaultManager faultManager = new FaultManager();
- SandeshaException fault = faultManager
- .checkForUnknownSequence(rmMsgCtx,
outSequenceId, storageManager);
- if(fault == null) {
- fault =
faultManager.checkForInvalidAcknowledgement(rmMsgCtx, storageManager);
- }
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForUnknownSequence(rmMsgCtx, outSequenceId,
storageManager);
+ FaultManager.checkForInvalidAcknowledgement(rmMsgCtx,
storageManager);
SenderBean input = new SenderBean();
input.setSend(true);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?view=diff&rev=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
Fri Dec 8 05:30:22 2006
@@ -87,11 +87,7 @@
secManager.checkProofOfPossession(token, body, msgCtx);
}
- FaultManager faultManager = new FaultManager();
- SandeshaException fault =
faultManager.checkForUnknownSequence(rmMsgCtx, sequenceId, storageManager);
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForUnknownSequence(rmMsgCtx, sequenceId,
storageManager);
SequencePropertyBean sequenceClosedBean = new
SequencePropertyBean();
sequenceClosedBean.setSequencePropertyKey(sequencePropertyKey);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Fri Dec 8 05:30:22 2006
@@ -79,11 +79,7 @@
ConfigurationContext context =
createSeqMsg.getConfigurationContext();
StorageManager storageManager =
SandeshaUtil.getSandeshaStorageManager(context, context.getAxisConfiguration());
- FaultManager faultManager = new FaultManager();
- SandeshaException fault =
faultManager.checkForCreateSequenceRefused(createSeqMsg, storageManager);
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForCreateSequenceRefused(createSeqMsg,
storageManager);
// If the inbound CreateSequence includes a
SecurityTokenReference then
// ask the security manager to resolve that to a token for us.
We also
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?view=diff&rev=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
Fri Dec 8 05:30:22 2006
@@ -134,26 +134,15 @@
throw new SandeshaException(message);
}
- FaultManager faultManager = new FaultManager();
- SandeshaException fault =
faultManager.checkForUnknownSequence(rmMsgCtx, sequenceId, storageManager);
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForUnknownSequence(rmMsgCtx, sequenceId,
storageManager);
// setting mustUnderstand to false.
sequence.setMustUnderstand(false);
rmMsgCtx.addSOAPEnvelope();
// throwing a fault if the sequence is closed.
- fault = faultManager.checkForSequenceClosed(rmMsgCtx,
sequenceId, storageManager);
- if (fault != null) {
- throw fault;
- }
-
- fault = faultManager.checkForLastMsgNumberExceeded(rmMsgCtx,
storageManager);
- if (fault != null) {
- throw fault;
- }
+ FaultManager.checkForSequenceClosed(rmMsgCtx, sequenceId,
storageManager);
+ FaultManager.checkForLastMsgNumberExceeded(rmMsgCtx,
storageManager);
// updating the last activated time of the sequence.
SequenceManager.updateLastActivatedTime(propertyKey,
storageManager);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Fri Dec 8 05:30:22 2006
@@ -100,13 +100,7 @@
secManager.checkProofOfPossession(token, body,
terminateSeqRMMsg.getMessageContext());
}
- FaultManager faultManager = new FaultManager();
- SandeshaException fault =
faultManager.checkForUnknownSequence(terminateSeqRMMsg, sequenceId,
- storageManager);
- if (fault != null) {
- throw fault;
- }
-
+ FaultManager.checkForUnknownSequence(terminateSeqRMMsg,
sequenceId, storageManager);
SequencePropertyBean terminateReceivedBean = new
SequencePropertyBean();
terminateReceivedBean.setSequencePropertyKey(sequencePropertyKey);
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=484592&r1=484591&r2=484592
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Fri Dec 8 05:30:22 2006
@@ -63,9 +63,6 @@
private static final Log log = LogFactory.getLog(FaultManager.class);
- public FaultManager() {
- }
-
/**
* Check weather the CreateSequence should be refused and generate the
fault
* if it should.
@@ -74,7 +71,7 @@
* @return
* @throws SandeshaException
*/
- public SandeshaException checkForCreateSequenceRefused(MessageContext
createSequenceMessage,
+ public static void checkForCreateSequenceRefused(MessageContext
createSequenceMessage,
StorageManager storageManager) throws AxisFault {
if (log.isDebugEnabled())
@@ -110,14 +107,12 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForCreateSequenceRefused, refused sequence");
- return getFault(createSequenceRMMsg, data,
createSequenceRMMsg.getAddressingNamespaceValue(),
+ getFault(createSequenceRMMsg, data,
createSequenceRMMsg.getAddressingNamespaceValue(),
storageManager);
}
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForCreateSequenceRefused");
- return null;
-
}
/**
@@ -127,7 +122,7 @@
* @param msgCtx
* @return
*/
- public SandeshaException checkForLastMsgNumberExceeded(RMMsgContext
applicationRMMessage, StorageManager storageManager)
+ public static void checkForLastMsgNumberExceeded(RMMsgContext
applicationRMMessage, StorageManager storageManager)
throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter:
FaultManager::checkForLastMsgNumberExceeded");
@@ -172,16 +167,15 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForLastMsgNumberExceeded, lastMessageNumberExceeded");
- return getFault(applicationRMMessage, faultData,
applicationRMMessage.getAddressingNamespaceValue(),
+ getFault(applicationRMMessage, faultData,
applicationRMMessage.getAddressingNamespaceValue(),
storageManager);
}
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForLastMsgNumberExceeded");
- return null;
}
- public RMMsgContext checkForMessageNumberRoleover(MessageContext
messageContext) {
+ public static RMMsgContext checkForMessageNumberRoleover(MessageContext
messageContext) {
return null;
}
@@ -194,7 +188,7 @@
* @return
* @throws SandeshaException
*/
- public SandeshaException checkForUnknownSequence(RMMsgContext
rmMessageContext, String sequenceID,
+ public static void checkForUnknownSequence(RMMsgContext
rmMessageContext, String sequenceID,
StorageManager storageManager) throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter:
FaultManager::checkForUnknownSequence, " + sequenceID);
@@ -259,14 +253,12 @@
data.setReason(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noSequenceEstablished,
sequenceID));
if (log.isDebugEnabled())
- log.debug("Exit:
FaultManager::checkForUnknownSequence");
-
- return getFault(rmMessageContext, data,
rmMessageContext.getAddressingNamespaceValue(), storageManager);
+ log.debug("Exit:
FaultManager::checkForUnknownSequence, Sequence unknown");
+ getFault(rmMessageContext, data,
rmMessageContext.getAddressingNamespaceValue(), storageManager);
}
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForUnknownSequence");
- return null;
}
/**
@@ -277,7 +269,7 @@
* @return
* @throws SandeshaException
*/
- public SandeshaException checkForInvalidAcknowledgement(RMMsgContext
ackRMMessageContext, StorageManager storageManager)
+ public static void checkForInvalidAcknowledgement(RMMsgContext
ackRMMessageContext, StorageManager storageManager)
throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter:
FaultManager::checkForInvalidAcknowledgement");
@@ -289,7 +281,6 @@
if (ackRMMessageContext.getMessageType() !=
Sandesha2Constants.MessageTypes.ACK) {
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement, MessageType not an ACK");
- return null;
}
boolean invalidAck = false;
@@ -336,7 +327,7 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement, invalid ACK");
- return getFault(ackRMMessageContext, data,
ackRMMessageContext.getAddressingNamespaceValue(),
+ getFault(ackRMMessageContext, data,
ackRMMessageContext.getAddressingNamespaceValue(),
storageManager);
}
@@ -344,11 +335,9 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement");
-
- return null;
}
- public SandeshaException checkForSequenceClosed(RMMsgContext
referenceRMMessage, String sequenceID,
+ public static void checkForSequenceClosed(RMMsgContext
referenceRMMessage, String sequenceID,
StorageManager storageManager) throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter: FaultManager::checkForSequenceClosed,
" + sequenceID);
@@ -387,14 +376,11 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForSequenceClosed, sequence closed");
- return getFault(referenceRMMessage, data,
referenceRMMessage.getAddressingNamespaceValue(), storageManager);
+ getFault(referenceRMMessage, data,
referenceRMMessage.getAddressingNamespaceValue(), storageManager);
}
if (log.isDebugEnabled())
log.debug("Exit: FaultManager::checkForSequenceClosed");
-
- return null;
-
}
/**
@@ -409,7 +395,7 @@
*
* @throws AxisFault
*/
- public SandeshaException getFault (RMMsgContext referenceRMMsgContext,
FaultData data, String addressingNamespaceURI,
+ public static void getFault (RMMsgContext referenceRMMsgContext,
FaultData data, String addressingNamespaceURI,
StorageManager storageManager) throws AxisFault {
SOAPFactory factory = (SOAPFactory)
referenceRMMsgContext.getSOAPEnvelope().getOMFactory();
@@ -448,7 +434,7 @@
}
SandeshaException fault = new SandeshaException("");
- return fault;
+ throw fault;
}
public static boolean isRMFault (String faultSubcodeValue) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
