activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6281
Date Thu, 05 May 2016 16:59:42 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 1ccd17791 -> 5096463b0


https://issues.apache.org/jira/browse/AMQ-6281

Deprecate the copyMessage option and remove usage, always copy a
forwarded message.

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

Branch: refs/heads/master
Commit: 5096463b00c4f470b108760f6849f9a0433b6fa0
Parents: 1ccd177
Author: Timothy Bish <tabish121@gmail.com>
Authored: Thu May 5 12:59:29 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Thu May 5 12:59:29 2016 -0400

----------------------------------------------------------------------
 .../region/virtual/CompositeDestination.java    | 55 ++++++++++++--------
 .../virtual/CompositeDestinationFilter.java     | 23 +++-----
 2 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/5096463b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
index a032710..bb62541 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestination.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -24,20 +24,16 @@ import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.CommandTypes;
 
-/**
- *
- *
- */
 public abstract class CompositeDestination implements VirtualDestination {
+
     private String name;
     private Collection forwardTo;
     private boolean forwardOnly = true;
-    private boolean copyMessage = true;
     private boolean concurrentSend = false;
 
     @Override
     public Destination intercept(Destination destination) {
-        return new CompositeDestinationFilter(destination, getForwardTo(), isForwardOnly(),
isCopyMessage(), isConcurrentSend());
+        return new CompositeDestinationFilter(destination, getForwardTo(), isForwardOnly(),
isConcurrentSend());
     }
 
     @Override
@@ -83,17 +79,20 @@ public abstract class CompositeDestination implements VirtualDestination
{
         this.forwardOnly = forwardOnly;
     }
 
+    @Deprecated
     public boolean isCopyMessage() {
-        return copyMessage;
+        return true;
     }
 
     /**
      * Sets whether a copy of the message will be sent to each destination.
      * Defaults to true so that the forward destination is set as the
      * destination of the message
+     *
+     * @deprecated this option will be removed in a later release, message are always copied.
      */
+    @Deprecated
     public void setCopyMessage(boolean copyMessage) {
-        this.copyMessage = copyMessage;
     }
 
     /**
@@ -109,7 +108,6 @@ public abstract class CompositeDestination implements VirtualDestination
{
 
     @Override
     public ActiveMQDestination getMappedDestinations() {
-
         final ActiveMQDestination[] destinations = new ActiveMQDestination[forwardTo.size()];
         int i = 0;
         for (Object dest : forwardTo) {
@@ -148,39 +146,50 @@ public abstract class CompositeDestination implements VirtualDestination
{
         final int prime = 31;
         int result = 1;
         result = prime * result + (concurrentSend ? 1231 : 1237);
-        result = prime * result + (copyMessage ? 1231 : 1237);
         result = prime * result + (forwardOnly ? 1231 : 1237);
-        result = prime * result
-                + ((forwardTo == null) ? 0 : forwardTo.hashCode());
+        result = prime * result + ((forwardTo == null) ? 0 : forwardTo.hashCode());
         result = prime * result + ((name == null) ? 0 : name.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+
+        if (getClass() != obj.getClass()) {
             return false;
+        }
+
         CompositeDestination other = (CompositeDestination) obj;
-        if (concurrentSend != other.concurrentSend)
-            return false;
-        if (copyMessage != other.copyMessage)
+        if (concurrentSend != other.concurrentSend) {
             return false;
-        if (forwardOnly != other.forwardOnly)
+        }
+
+        if (forwardOnly != other.forwardOnly) {
             return false;
+        }
+
         if (forwardTo == null) {
-            if (other.forwardTo != null)
+            if (other.forwardTo != null) {
                 return false;
-        } else if (!forwardTo.equals(other.forwardTo))
+            }
+        } else if (!forwardTo.equals(other.forwardTo)) {
             return false;
+        }
+
         if (name == null) {
             if (other.name != null)
                 return false;
-        } else if (!name.equals(other.name))
+        } else if (!name.equals(other.name)) {
             return false;
+        }
+
         return true;
     }
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/5096463b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
index 56506f8..dda505c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/CompositeDestinationFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -35,24 +35,21 @@ import org.apache.activemq.filter.NonCachedMessageEvaluationContext;
 /**
  * Represents a composite {@link Destination} where send()s are replicated to
  * each Destination instance.
- * 
- * 
  */
 public class CompositeDestinationFilter extends DestinationFilter {
 
     private Collection forwardDestinations;
     private boolean forwardOnly;
-    private boolean copyMessage;
     private boolean concurrentSend = false;
 
-    public CompositeDestinationFilter(Destination next, Collection forwardDestinations, boolean
forwardOnly, boolean copyMessage, boolean concurrentSend) {
+    public CompositeDestinationFilter(Destination next, Collection forwardDestinations, boolean
forwardOnly, boolean concurrentSend) {
         super(next);
         this.forwardDestinations = forwardDestinations;
         this.forwardOnly = forwardOnly;
-        this.copyMessage = copyMessage;
         this.concurrentSend = concurrentSend;
     }
 
+    @Override
     public void send(final ProducerBrokerExchange context, final Message message) throws
Exception {
         MessageEvaluationContext messageContext = null;
 
@@ -113,19 +110,13 @@ public class CompositeDestinationFilter extends DestinationFilter {
     }
 
     private void doForward(ProducerBrokerExchange context, Message message, Broker regionBroker,
ActiveMQDestination destination) throws Exception {
-        Message forwarded_message;
+        Message forwardedMessage = message.copy();
 
-        if (copyMessage) {
-            forwarded_message = message.copy();
-            forwarded_message.setOriginalDestination( message.getDestination() );
-            forwarded_message.setDestination(destination);
-        }
-        else {
-            forwarded_message = message;
-        }
+        forwardedMessage.setOriginalDestination( message.getDestination() );
+        forwardedMessage.setDestination(destination);
 
         // Send it back through the region broker for routing.
         context.setMutable(true);
-        regionBroker.send(context, forwarded_message);
+        regionBroker.send(context, forwardedMessage);
     }
 }


Mime
View raw message