[jboss-cvs] JBoss Messaging SVN: r8380 - in branches/Branch_1_4/src/main/org/jboss/jms: wireformat and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 6 16:52:01 EDT 2011
Author: jbertram
Date: 2011-07-06 16:52:01 -0400 (Wed, 06 Jul 2011)
New Revision: 8380
Modified:
branches/Branch_1_4/src/main/org/jboss/jms/tx/ClientTransaction.java
branches/Branch_1_4/src/main/org/jboss/jms/tx/TransactionRequest.java
branches/Branch_1_4/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java
Log:
JBMESSAGING-1884
Modified: branches/Branch_1_4/src/main/org/jboss/jms/tx/ClientTransaction.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/tx/ClientTransaction.java 2011-07-06 08:18:09 UTC (rev 8379)
+++ branches/Branch_1_4/src/main/org/jboss/jms/tx/ClientTransaction.java 2011-07-06 20:52:01 UTC (rev 8380)
@@ -68,6 +68,9 @@
private boolean rollbackOnly = false;
+ /* Not sent over the wire, this is for differentiating between incompatible versions */
+ protected boolean supportsRecovered ;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -235,7 +238,16 @@
recovered = b;
}
+ public void setSupportsRecovered(final boolean supportsRecovered)
+ {
+ this.supportsRecovered = supportsRecovered ;
+ }
+ public boolean getSupportsRecovered()
+ {
+ return supportsRecovered ;
+ }
+
// Streamable implementation ---------------------------------
public void write(DataOutputStream out) throws Exception
@@ -293,7 +305,10 @@
out.writeLong(Long.MIN_VALUE);
}
}
- out.writeBoolean(recovered);
+ if (supportsRecovered)
+ {
+ out.writeBoolean(recovered);
+ }
}
@@ -338,7 +353,10 @@
}
}
- recovered = in.readBoolean();
+ if (supportsRecovered)
+ {
+ recovered = in.readBoolean();
+ }
}
// Protected -----------------------------------------------------
Modified: branches/Branch_1_4/src/main/org/jboss/jms/tx/TransactionRequest.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/tx/TransactionRequest.java 2011-07-06 08:18:09 UTC (rev 8379)
+++ branches/Branch_1_4/src/main/org/jboss/jms/tx/TransactionRequest.java 2011-07-06 20:52:01 UTC (rev 8380)
@@ -67,6 +67,9 @@
protected ClientTransaction state;
+ /* Not send over the wire, this is for differentiating between incompatible versions of ClientTransaction */
+ protected boolean supportsRecovered ;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -110,6 +113,7 @@
if (state != null)
{
out.write(PRESENT);
+ state.setSupportsRecovered(supportsRecovered) ;
state.write(out);
}
else
@@ -153,6 +157,7 @@
else
{
state = new ClientTransaction();
+ state.setSupportsRecovered(supportsRecovered) ;
state.read(in);
}
@@ -175,6 +180,16 @@
return requestType;
}
+ public void setSupportsRecovered(final boolean supportsRecovered)
+ {
+ this.supportsRecovered = supportsRecovered ;
+ }
+
+ public boolean getSupportsRecovered()
+ {
+ return supportsRecovered ;
+ }
+
public String toString()
{
return "TransactionRequest[" +
Modified: branches/Branch_1_4/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java 2011-07-06 08:18:09 UTC (rev 8379)
+++ branches/Branch_1_4/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java 2011-07-06 20:52:01 UTC (rev 8380)
@@ -24,6 +24,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
+import org.jboss.jms.client.ConnectionCapabilities;
import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.tx.TransactionRequest;
@@ -63,6 +64,9 @@
super.read(is);
req = new TransactionRequest();
+
+ final boolean supportsRecovered = ConnectionCapabilities.doesConnectionSupportRecoveryRollback(version) ;
+ req.setSupportsRecovered(supportsRecovered) ;
req.read(is);
@@ -88,6 +92,9 @@
{
super.write(os);
+ final boolean supportsRecovered = ConnectionCapabilities.doesConnectionSupportRecoveryRollback(version) ;
+ req.setSupportsRecovered(supportsRecovered) ;
+
req.write(os);
os.writeBoolean(checkForDuplicates);
More information about the jboss-cvs-commits
mailing list