svn commit: r1346813 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: command/XATransactionId.java store/jdbc/adapter/DefaultJDBCAdapter.java

[gtully]

Author: gtully
Date: Wed Jun  6 10:29:35 2012
New Revision: 1346813

URL: http://svn.apache.org/viewvc?rev=1346813&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3872 - avoid property syntax for 
internal accessor to ensure property equality after seriaization in generated 
marshalling tests

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java?rev=1346813&r1=1346812&r2=1346813&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java
 Wed Jun  6 10:29:35 2012
@@ -94,7 +94,7 @@ public class XATransactionId extends Tra
         return encodedXidBytes;
     }
 
-    public DataByteArrayOutputStream getOutputStream() {
+    public DataByteArrayOutputStream internalOutputStream() {
         return outputStream;
     }
 

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java?rev=1346813&r1=1346812&r2=1346813&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
 Wed Jun  6 10:29:35 2012
@@ -503,7 +503,7 @@ public class DefaultJDBCAdapter implemen
     private byte[] encodeXid(XATransactionId xid, long seq, long priority) {
         byte[] xidVal = xid.getEncodedXidBytes();
         // encode the update
-        DataByteArrayOutputStream outputStream = xid.getOutputStream();
+        DataByteArrayOutputStream outputStream = xid.internalOutputStream();
         outputStream.position(1);
         outputStream.writeLong(seq);
         outputStream.writeByte(Long.valueOf(priority).byteValue());