activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject [2/3] git commit: Fix for https://issues.apache.org/jira/browse/AMQ-4719
Date Tue, 12 Nov 2013 08:10:35 GMT
Fix for https://issues.apache.org/jira/browse/AMQ-4719


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

Branch: refs/heads/trunk
Commit: 47d198513915532e1e8a3bcb0f9a6f98f5a794dd
Parents: 7e000d5
Author: Rob Davies <rajdavies@gmail.com>
Authored: Tue Nov 12 08:08:07 2013 +0000
Committer: Rob Davies <rajdavies@gmail.com>
Committed: Tue Nov 12 08:08:07 2013 +0000

----------------------------------------------------------------------
 .../org/apache/activemq/broker/TransportConnector.java    |  4 ++++
 .../apache/activemq/transport/vm/VMTransportServer.java   | 10 ++++++++++
 2 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/47d19851/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
index 4e31ee0..582bc3f 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -90,6 +90,9 @@ public class TransportConnector implements Connector, BrokerServiceAware
{
                 setEnableStatusMonitor(false);
             }
         }
+        if (server != null){
+            setAllowLinkStealing(server.isAllowLinkStealing());
+        }
     }
 
     /**
@@ -123,6 +126,7 @@ public class TransportConnector implements Connector, BrokerServiceAware
{
         rc.setMaximumConsumersAllowedPerConnection(getMaximumConsumersAllowedPerConnection());
         rc.setMaximumProducersAllowedPerConnection(getMaximumProducersAllowedPerConnection());
         rc.setPublishedAddressPolicy(getPublishedAddressPolicy());
+        rc.setAllowLinkStealing(isAllowLinkStealing());
         return rc;
     }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/47d19851/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
index b3dd21d..2f3d519 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java
@@ -39,6 +39,7 @@ public class VMTransportServer implements TransportServer {
 
     private final AtomicInteger connectionCount = new AtomicInteger(0);
     private final boolean disposeOnDisconnect;
+    private boolean allowLinkStealing;
 
     /**
      * @param location
@@ -142,4 +143,13 @@ public class VMTransportServer implements TransportServer {
     public boolean isSslServer() {
         return false;
     }
+
+    @Override
+    public boolean isAllowLinkStealing() {
+        return allowLinkStealing;
+    }
+
+    public void setAllowLinkStealing(boolean allowLinkStealing) {
+        this.allowLinkStealing = allowLinkStealing;
+    }
 }


Mime
View raw message