You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by bo...@apache.org on 2015/09/10 21:57:36 UTC

[4/5] qpid-proton git commit: PROTON-937: LinkImpl.localOpen() does not initialize source and target

PROTON-937: LinkImpl.localOpen() does not initialize source and target


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

Branch: refs/heads/master
Commit: bc460e8d55f37c96d017ac343fe2a541bab96d2b
Parents: 5e60ea9
Author: Bozo Dragojevic <bo...@digiverse.si>
Authored: Tue Jul 7 21:32:58 2015 +0200
Committer: Bozo Dragojevic <bo...@digiverse.si>
Committed: Thu Sep 10 21:57:12 2015 +0200

----------------------------------------------------------------------
 .../qpid/proton/amqp/messaging/Source.java       | 19 +++++++++++++++++++
 .../qpid/proton/amqp/messaging/Target.java       | 12 ++++++++++++
 .../qpid/proton/amqp/messaging/Terminus.java     | 17 +++++++++++++++++
 .../proton/amqp/transaction/Coordinator.java     |  5 +++++
 .../qpid/proton/amqp/transport/Source.java       |  2 ++
 .../qpid/proton/amqp/transport/Target.java       |  2 ++
 .../proton/messenger/impl/MessengerImpl.java     |  9 +++++++--
 .../apache/qpid/proton/reactor/Handshaker.java   | 12 +++++++++++-
 8 files changed, 75 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java
index 5efc15a..e6fffef 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java
@@ -21,7 +21,9 @@
 package org.apache.qpid.proton.amqp.messaging;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.qpid.proton.amqp.Symbol;
 
 public final class Source extends Terminus
@@ -32,6 +34,18 @@ public final class Source extends Terminus
     private Outcome _defaultOutcome;
     private Symbol[] _outcomes;
 
+    private Source(Source other) {
+        super(other);
+        _distributionMode = other._distributionMode;
+        if (other._filter != null)
+            _filter = new HashMap(other._filter);
+        _defaultOutcome = other._defaultOutcome;
+        if (other._outcomes != null)
+            _outcomes = other._outcomes.clone();
+    }
+    
+    public Source() {}
+
     public Symbol getDistributionMode()
     {
         return _distributionMode;
@@ -90,5 +104,10 @@ public final class Source extends Terminus
                ", capabilities=" + (getCapabilities() == null ? null : Arrays.asList(getCapabilities())) +
                '}';
     }
+
+    @Override
+    public org.apache.qpid.proton.amqp.transport.Source copy() {
+        return new Source(this);
+    }
 }
   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java
index 1749d40..38678d1 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java
@@ -28,6 +28,13 @@ import java.util.Arrays;
 public final class Target extends Terminus
       implements org.apache.qpid.proton.amqp.transport.Target
 {
+    private Target(Target other) {
+        super(other);
+    }
+
+    public Target() {
+    }
+
     @Override
     public String toString()
     {
@@ -41,5 +48,10 @@ public final class Target extends Terminus
                ", capabilities=" + (getCapabilities() == null ? null : Arrays.asList(getCapabilities())) +
                '}';
     }
+
+    @Override
+    public org.apache.qpid.proton.amqp.transport.Target copy() {
+        return new Target(this);
+    }
 }
   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
index be57957..ac28b32 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
@@ -20,7 +20,9 @@
  */
 package org.apache.qpid.proton.amqp.messaging;
 
+import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.qpid.proton.amqp.Symbol;
 import org.apache.qpid.proton.amqp.UnsignedInteger;
 
@@ -37,6 +39,21 @@ public abstract class Terminus
     Terminus()
     {
     }
+    
+    protected Terminus(Terminus other) {
+        _address = other._address;
+        _durable = other._durable;
+        _expiryPolicy = other._expiryPolicy;
+        _timeout = other._timeout;
+        _dynamic = other._dynamic;
+        if (other._dynamicNodeProperties != null) {
+            // TODO: Do we need to copy or can we make a simple reference?
+            _dynamicNodeProperties = new HashMap(other._dynamicNodeProperties); // FIXME
+        }
+        if (other._capabilities != null) {
+            _capabilities = other._capabilities.clone(); // FIXME?
+        }
+    }
 
     public final String getAddress()
     {

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
index 2af968d..7ff000a 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
@@ -55,5 +55,10 @@ public final class Coordinator
     {
         return null;
     }
+
+    @Override
+    public Target copy() {
+        return null;
+    }
 }
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java
index 93d71f7..2d6f3b2 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java
@@ -23,4 +23,6 @@ package org.apache.qpid.proton.amqp.transport;
 public interface Source
 {
     public String getAddress();
+
+    public Source copy();
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java
index 8b81f37..c972c02 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java
@@ -24,4 +24,6 @@ package org.apache.qpid.proton.amqp.transport;
 public interface Target
 {
     public String getAddress();
+
+    public Target copy();
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
index e6475b9..90f396c 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
@@ -790,8 +790,13 @@ public class MessengerImpl implements Messenger
         for (Link link : new Links(connection, UNINIT, ANY))
         {
             //TODO: the following is not correct; should only copy those properties that we understand
-            link.setSource(link.getRemoteSource());
-            link.setTarget(link.getRemoteTarget());
+            //TODO: is this any better:
+            if (link.getRemoteSource() != null) {
+                link.setSource(link.getRemoteSource().copy());
+            }
+            if (link.getRemoteTarget() != null) {
+                link.setTarget(link.getRemoteTarget().copy());
+            }
             linkAdded(link);
             link.open();
             _logger.log(Level.FINE, "Opened link " + link);

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc460e8d/proton-j/src/main/java/org/apache/qpid/proton/reactor/Handshaker.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/reactor/Handshaker.java b/proton-j/src/main/java/org/apache/qpid/proton/reactor/Handshaker.java
index cbd496e..1423f32 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/reactor/Handshaker.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/reactor/Handshaker.java
@@ -25,6 +25,7 @@ import org.apache.qpid.proton.engine.BaseHandler;
 import org.apache.qpid.proton.engine.Endpoint;
 import org.apache.qpid.proton.engine.EndpointState;
 import org.apache.qpid.proton.engine.Event;
+import org.apache.qpid.proton.engine.Link;
 
 /**
  * A handler that mirrors the actions of the remote end of a connection.  This
@@ -59,7 +60,16 @@ public class Handshaker extends BaseHandler {
 
     @Override
     public void onLinkRemoteOpen(Event event) {
-        open(event.getLink());
+        Link link = event.getLink();
+        if (link.getLocalState() == EndpointState.UNINITIALIZED) {
+            if (link.getRemoteSource() != null) {
+                link.setSource(link.getRemoteSource().copy());
+            }
+            if (link.getRemoteTarget() != null) {
+                link.setTarget(link.getRemoteTarget().copy());
+            }
+        }
+        open(link);
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org