Author: markt
Date: Tue Nov 9 17:08:25 2010
New Revision: 1033102
URL: http://svn.apache.org/viewvc?rev=1033102&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50184
Add an option to the RpcChannel to enable the Channel send options to be set
for the reply message.
Based on a patch by Ariel.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1033102&r1=1033101&r2=1033102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Tue Nov
9 17:08:25 2010
@@ -44,7 +44,8 @@ public class RpcChannel implements Chann
private Channel channel;
private RpcCallback callback;
private byte[] rpcId;
-
+ private int replyMessageOptions = 0;
+
private HashMap<RpcCollectorKey, RpcCollector> responseMap = new
HashMap<RpcCollectorKey, RpcCollector>();
/**
@@ -130,7 +131,8 @@ public class RpcChannel implements Chann
rmsg.reply = true;
rmsg.message = reply;
try {
- channel.send(new Member[] {sender}, rmsg,0);
+ channel.send(new Member[] {sender}, rmsg,
+ replyMessageOptions &
~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK);
}catch ( Exception x ) {
log.error("Unable to send back reply in RpcChannel.",x);
}
@@ -178,7 +180,14 @@ public class RpcChannel implements Chann
this.rpcId = rpcId;
}
+ public int getReplyMessageOptions() {
+ return replyMessageOptions;
+ }
+ public void setReplyMessageOptions(int replyMessageOptions) {
+ this.replyMessageOptions = replyMessageOptions;
+ }
+
/**
*
* Class that holds all response.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033102&r1=1033101&r2=1033102&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 9 17:08:25 2010
@@ -163,6 +163,11 @@
If maxInactiveInterval is negative, an access message is not sending.
(kfujino)
</fix>
+ <fix>
+ <bug>50184</bug>: Add an option to the RpcChannel to enable the Channel
+ send options to be set for the reply message. Based on a patch by
Ariel.
+ (markt))
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
