You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/02/04 13:48:59 UTC

[2/6] qpid-jms git commit: create the correct type of target, which can differ based on the context

create the correct type of target, which can differ based on the context


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

Branch: refs/heads/master
Commit: a3f7e7e6c6b6c000a0f260b107c2048a2da7c5cb
Parents: 24bc806
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Feb 4 11:19:55 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Feb 4 11:19:55 2015 +0000

----------------------------------------------------------------------
 .../qpid/jms/test/testpeer/TestAmqpPeer.java       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a3f7e7e6/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index f55b913..2811df2 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -44,6 +44,7 @@ import org.apache.qpid.jms.test.testpeer.describedtypes.Accepted;
 import org.apache.qpid.jms.test.testpeer.describedtypes.AttachFrame;
 import org.apache.qpid.jms.test.testpeer.describedtypes.BeginFrame;
 import org.apache.qpid.jms.test.testpeer.describedtypes.CloseFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.Coordinator;
 import org.apache.qpid.jms.test.testpeer.describedtypes.DetachFrame;
 import org.apache.qpid.jms.test.testpeer.describedtypes.DispositionFrame;
 import org.apache.qpid.jms.test.testpeer.describedtypes.EndFrame;
@@ -492,7 +493,7 @@ public class TestAmqpPeer implements AutoCloseable
                 attachResponse.setName(attachMatcher.getReceivedName());
                 attachResponse.setSource(attachMatcher.getReceivedSource());
 
-                Target t = createTargetObjectFromDescribedType(attachMatcher.getReceivedTarget());
+                Target t = (Target) createTargetObjectFromDescribedType(attachMatcher.getReceivedTarget());
                 t.setAddress(dynamicAddress);
 
                 attachResponse.setTarget(t);
@@ -991,13 +992,19 @@ public class TestAmqpPeer implements AutoCloseable
             .withState(stateMatcher));
     }
 
-    private Target createTargetObjectFromDescribedType(Object o) {
+    private Object createTargetObjectFromDescribedType(Object o) {
         assertThat(o, instanceOf(DescribedType.class));
-        Object described = ((DescribedType)o).getDescribed();
+        Object described = ((DescribedType) o).getDescribed();
         assertThat(described, instanceOf(List.class));
         @SuppressWarnings("unchecked")
         List<Object> targetFields = (List<Object>) described;
-
-        return new Target(targetFields);
+        Object descriptor = ((DescribedType) o).getDescriptor();
+        if (descriptor == Target.DESCRIPTOR_CODE || descriptor.equals(Target.DESCRIPTOR_SYMBOL)) {
+            return new Target(targetFields.toArray());
+        } else if (descriptor == Coordinator.DESCRIPTOR_CODE || descriptor.equals(Coordinator.DESCRIPTOR_SYMBOL)) {
+            return new Coordinator(targetFields.toArray());
+        } else {
+            throw new IllegalArgumentException("Unexpected target descriptor: " + descriptor);
+        }
     }
 }


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