Author: amilas
Date: Thu Oct 1 07:37:22 2009
New Revision: 820550
URL: http://svn.apache.org/viewvc?rev=820550&view=rev
Log:
adding some fixes done to trunk while doing some interop tests
Modified:
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/src/test/java/org/apache/sandesha2/scenarios/UnsupportedScenariosTest.java
Modified:
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=820550&r1=820549&r2=820550&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Thu Oct 1 07:37:22 2009
@@ -318,17 +318,6 @@
} else {
specVersion = rmsBean.getRMVersion();
}
-
if(specVersion.equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)) {
- EndpointReference replyTo =
msgContext.getReplyTo();
- if(replyTo == null ||
replyTo.hasAnonymousAddress()) {
- //we are sync
- SandeshaPolicyBean policy =
SandeshaUtil.getPropertyBean(configContext.getAxisConfiguration());
-
if(!policy.isEnableMakeConnection()) {
- String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.makeConnectionDisabled);
- throw new
SandeshaException(message);
- }
- }
- }
}
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?rev=820550&r1=820549&r2=820550&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
Thu Oct 1 07:37:22 2009
@@ -178,6 +178,11 @@
rmMsgCtx.setWSAAction(SpecSpecificConstants.getCloseSequenceAction(getRMVersion()));
rmMsgCtx.setSOAPAction(SpecSpecificConstants.getCloseSequenceAction
(getRMVersion()));
+ // setting the sequence reply to address
+ if
(getRMSBean().getRMVersion().equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)) {
+ rmMsgCtx.setReplyTo(getRMSBean().getAcksToEndpointReference());
+ }
+
// Send this outgoing message
sendOutgoingMessage(rmMsgCtx,
Sandesha2Constants.MessageTypes.CLOSE_SEQUENCE, 0, transaction);
Modified:
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?rev=820550&r1=820549&r2=820550&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
Thu Oct 1 07:37:22 2009
@@ -428,6 +428,13 @@
t.acknowledgeMessage(msgCtx);
}
}
+
+ // if the relates to is not null then this is at the client side
+ // so it is receiving a response. always have to return the thread.
+ if (msgCtx.getRelatesTo() != null) {
+ result = InvocationResponse.ABORT;
+ }
+
}
if (transaction != null && transaction.isActive())
Modified:
webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/src/test/java/org/apache/sandesha2/scenarios/UnsupportedScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/src/test/java/org/apache/sandesha2/scenarios/UnsupportedScenariosTest.java?rev=820550&r1=820549&r2=820550&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/src/test/java/org/apache/sandesha2/scenarios/UnsupportedScenariosTest.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/src/test/java/org/apache/sandesha2/scenarios/UnsupportedScenariosTest.java
Thu Oct 1 07:37:22 2009
@@ -41,17 +41,6 @@
// Run a ping test with sync acks - this should work even
though MakeConnection is disabled
runPing(false, false);
- // Run an echo test with sync acks - this should fail as
MakeConnection is disabled
- AxisFault fault = null;
- Options clientOptions = new Options();
-
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
- try {
- runEcho(clientOptions, false, false, false, false,
true);
- } catch (AxisFault e) {
- fault = e;
- System.out.println("Caught expected fault: " + e);
- }
- assertNotNull("Expected fault", fault);
}
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
