Author: gatfora
Date: Tue May 6 08:28:33 2008
New Revision: 653810
URL: http://svn.apache.org/viewvc?rev=653810&view=rev
Log:
Apply fixes for SANDESHA2-147 and SANDESHA2-150
Modified:
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
Modified:
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?rev=653810&r1=653809&r2=653810&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
Tue May 6 08:28:33 2008
@@ -258,12 +258,15 @@
while(ops.hasNext()) {
AxisOperation op = (AxisOperation) ops.next();
if (log.isDebugEnabled()) log.debug("Examining
operation " + op.getName() + ", mep " + op.getMessageExchangePattern());
-
+
String name = null;
QName qName = op.getName();
if(qName != null) name = qName.getLocalPart();
- if((name != null &&
name.startsWith(Sandesha2Constants.SANDESHA_OP_PREFIX)))
- continue;
+
+ //Check to see if the operation is a sandesha
defined one or an axis2 defined one
+ if((name != null) &&
(name.startsWith(Sandesha2Constants.SANDESHA_OP_PREFIX) ||
+
qName.getNamespaceURI().equals(org.apache.axis2.namespace.Constants.AXIS2_NAMESPACE_URI)))
+ continue;
// If we get to here then we must have one of
the user's operations, so
// check the MEP.
@@ -280,7 +283,9 @@
String name = null;
QName qName = op.getName();
if(qName != null) name = qName.getLocalPart();
- if((name != null &&
!name.startsWith(Sandesha2Constants.SANDESHA_OP_PREFIX))) {
+ //Check to see if the operation is a sandesha defined
one or an axis2 defined one
+ if(name != null &&
(!name.startsWith(Sandesha2Constants.SANDESHA_OP_PREFIX) ||
+
!qName.getNamespaceURI().equals(org.apache.axis2.namespace.Constants.AXIS2_NAMESPACE_URI)))
{
// If we get to here then we must have one of
the user's operations, so
// check the MEP.
if(op.getAxisSpecificMEPConstant() ==
WSDLConstants.MEP_CONSTANT_OUT_IN) {
Modified:
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?rev=653810&r1=653809&r2=653810&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
Tue May 6 08:28:33 2008
@@ -190,7 +190,7 @@
try {
AxisEngine.send(ackMsgCtx);
- TransportUtils.setResponseWritten(ackMsgCtx,
true);
+
TransportUtils.setResponseWritten(rmMsgCtx.getMessageContext(), true);
} catch (AxisFault e1) {
throw new SandeshaException(e1.getMessage());
}
@@ -254,13 +254,12 @@
// inserting the new Ack.
senderBeanMgr.insert(ackBean);
- msgContext.pause();
-
- if (log.isDebugEnabled())
- log.debug("Exit:
AckRequestedProcessor::processAckRequestedHeader " + Boolean.TRUE);
-
+ msgContext.pause();
}
+ if (log.isDebugEnabled())
+ log.debug("Exit:
AckRequestedProcessor::processAckRequestedHeader " + Boolean.FALSE);
+
//No need to suspend. Just proceed.
return false;
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=653810&r1=653809&r2=653810&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
Tue May 6 08:28:33 2008
@@ -463,7 +463,7 @@
public static void assertProofOfPossession(RMSequenceBean bean,
MessageContext context, OMElement elementToCheck)throws SandeshaException{
if (log.isDebugEnabled())
- log.debug("Enter: SandeshaUtil::assertProofOfPossession
:" + bean + ", " + context + ", " + elementToCheck);
+ log.debug("Enter: SandeshaUtil::assertProofOfPossession
:" + bean + ", " + context + ", " + elementToCheck.getQName());
String tokenData = null;
if(bean!=null){
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
