You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2015/12/16 15:42:17 UTC

[2/3] activemq git commit: https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more ins

https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more instances of this. It avoids the need to check for null and sync

(cherry picked from commit 8136e67b408a3d756241ebdf8de9347eb6135363)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c3339bc0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c3339bc0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c3339bc0

Branch: refs/heads/activemq-5.12.x
Commit: c3339bc0fb12492f039a290930ea989d939cafb2
Parents: b84785d
Author: gtully <ga...@gmail.com>
Authored: Fri Oct 30 11:53:09 2015 +0000
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Wed Dec 16 14:41:37 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/command/ConsumerInfo.java   | 5 +++++
 .../apache/activemq/transport/xstream/XStreamWireFormat.java  | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/c3339bc0/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
index ed97a48..16e6f8c2 100755
--- a/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
@@ -527,4 +527,9 @@ public class ConsumerInfo extends BaseCommand {
         return result;
     }
 
+    public void initTransients() {
+        assignedGroupCount = new ConcurrentHashMap<>();
+        lastDeliveredSequenceId = RemoveInfo.LAST_DELIVERED_UNSET;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/c3339bc0/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
----------------------------------------------------------------------
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java b/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
index a8df446..66ade8d 100755
--- a/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
@@ -24,6 +24,7 @@ import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.MarshallAware;
 import org.apache.activemq.command.MessageDispatch;
 import org.apache.activemq.transport.stomp.XStreamSupport;
@@ -64,7 +65,11 @@ public class XStreamWireFormat extends TextWireFormat {
 
     @Override
     public Object unmarshalText(Reader reader) {
-        return getXStream().fromXML(reader);
+        Object val = getXStream().fromXML(reader);
+        if (val instanceof ConsumerInfo) {
+            ((ConsumerInfo)val).initTransients();
+        }
+        return val;
     }
 
     @Override