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:58 UTC
[1/6] qpid-jms git commit: remove intermediate array and build the
list directly
Repository: qpid-jms
Updated Branches:
refs/heads/master d2a8da990 -> 5d40bc407
remove intermediate array and build the list directly
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/24bc8061
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/24bc8061
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/24bc8061
Branch: refs/heads/master
Commit: 24bc8061e38eaf6bb0e8f08fcde1bfffa07745f0
Parents: d2a8da9
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Feb 4 11:16:38 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Feb 4 11:16:38 2015 +0000
----------------------------------------------------------------------
.../apache/qpid/jms/test/testpeer/ListDescribedType.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/24bc8061/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java
index 06e1d91..14ba2a8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java
@@ -19,6 +19,8 @@
package org.apache.qpid.jms.test.testpeer;
import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
import org.apache.qpid.proton.amqp.DescribedType;
@@ -44,13 +46,14 @@ public abstract class ListDescribedType implements DescribedType
}
}
- Object[] usedFields = new Object[numUsedFields];
+ // Create a list with the fields in the correct positions.
+ List<Object> list = new LinkedList<Object>();
for(int j = 0; j < numUsedFields; j++)
{
- usedFields[j] = _fields[j];
+ list.add(_fields[j]);
}
- return Arrays.asList(usedFields);
+ return list;
}
protected Object[] getFields()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[6/6] qpid-jms git commit: return after re-scheduling the task
Posted by ro...@apache.org.
return after re-scheduling the task
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5d40bc40
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5d40bc40
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5d40bc40
Branch: refs/heads/master
Commit: 5d40bc407dc6bf4c3a38ff519613b8d38a11d753
Parents: f0dd9de
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Feb 4 12:34:20 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Feb 4 12:34:20 2015 +0000
----------------------------------------------------------------------
.../org/apache/qpid/jms/provider/failover/FailoverProvider.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5d40bc40/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index 8f623b7..6726631 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -539,6 +539,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
if (initialReconnectDelay > 0 && reconnectAttempts == 0) {
LOG.trace("Delayed initial reconnect attempt will be in {} milliseconds", initialReconnectDelay);
connectionHub.schedule(this, initialReconnectDelay, TimeUnit.MILLISECONDS);
+ return;
}
reconnectAttempts++;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/6] qpid-jms git commit: change to Proton 0.8,
get most of the tests working
Posted by ro...@apache.org.
change to Proton 0.8, get most of the tests working
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/99ef5261
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/99ef5261
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/99ef5261
Branch: refs/heads/master
Commit: 99ef526191860192f3db785144770909d0675ece
Parents: a3f7e7e
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Feb 4 11:38:09 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Feb 4 11:38:09 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
.../jms/integration/SessionIntegrationTest.java | 4 ++
.../qpid/jms/test/testpeer/TestAmqpPeer.java | 40 ++++++++++++++++++--
3 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/99ef5261/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66c581c..48a5691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<junit-version>4.12</junit-version>
<slf4j-version>1.7.10</slf4j-version>
<activemq-version>5.11-SNAPSHOT</activemq-version>
- <proton-version>1.0-SNAPSHOT</proton-version>
+ <proton-version>0.8</proton-version>
<fuse-joram-tests-version>1.0</fuse-joram-tests-version>
<jetty-version>8.1.16.v20140903</jetty-version>
<mockito-version>1.10.16</mockito-version>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/99ef5261/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index 16cf2a7..82ff888 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -360,6 +360,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
}
}
+ @Ignore // The *test* needs Proton 0.9, enable when upgrading.
@Test(timeout = 5000)
public void testCreateAnonymousProducerTargetContainsNoTypeCapabilityWhenAnonymousRelayNodeIsSupported() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
@@ -551,6 +552,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
}
}
+ @Ignore // The *test* needs Proton 0.9, enable when upgrading.
@Test(timeout = 5000)
public void testCreateAnonymousProducerWhenAnonymousRelayNodeIsSupported() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
@@ -599,11 +601,13 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
}
}
+ @Ignore // The *test* needs Proton 0.9, enable when upgrading.
@Test(timeout = 5000)
public void testCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedAndAttachResponseWriteIsNotDeferred() throws Exception {
doCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedTestImpl(false);
}
+ @Ignore // The *test* needs Proton 0.9, enable when upgrading.
@Test(timeout = 5000)
public void testCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedAndAttachResponseWriteIsDeferred() throws Exception {
doCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedTestImpl(true);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/99ef5261/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 2811df2..53b5758 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
@@ -52,6 +52,7 @@ import org.apache.qpid.jms.test.testpeer.describedtypes.FlowFrame;
import org.apache.qpid.jms.test.testpeer.describedtypes.OpenFrame;
import org.apache.qpid.jms.test.testpeer.describedtypes.SaslMechanismsFrame;
import org.apache.qpid.jms.test.testpeer.describedtypes.SaslOutcomeFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.Source;
import org.apache.qpid.jms.test.testpeer.describedtypes.Target;
import org.apache.qpid.jms.test.testpeer.describedtypes.TransferFrame;
import org.apache.qpid.jms.test.testpeer.describedtypes.sections.ApplicationPropertiesDescribedType;
@@ -495,6 +496,7 @@ public class TestAmqpPeer implements AutoCloseable
Target t = (Target) createTargetObjectFromDescribedType(attachMatcher.getReceivedTarget());
t.setAddress(dynamicAddress);
+ trimTargetCapabilities(t);
attachResponse.setTarget(t);
}
@@ -565,11 +567,11 @@ public class TestAmqpPeer implements AutoCloseable
{
attachResponseSender.setChannel(attachMatcher.getActualChannel());
attachResponse.setName(attachMatcher.getReceivedName());
- attachResponse.setSource(attachMatcher.getReceivedSource());
+ attachResponse.setSource(trimSourceOutcomesCapabilities(createSourceObjectFromDescribedType(attachMatcher.getReceivedSource())));
if(refuseLink) {
attachResponse.setTarget(null);
} else {
- attachResponse.setTarget(attachMatcher.getReceivedTarget());
+ attachResponse.setTarget(trimTargetCapabilities(createTargetObjectFromDescribedType(attachMatcher.getReceivedTarget())));
}
}
});
@@ -652,7 +654,7 @@ public class TestAmqpPeer implements AutoCloseable
{
attachResponseSender.setChannel(attachMatcher.getActualChannel());
attachResponse.setName(attachMatcher.getReceivedName());
- attachResponse.setSource(attachMatcher.getReceivedSource());
+ attachResponse.setSource(trimSourceOutcomesCapabilities(createSourceObjectFromDescribedType(attachMatcher.getReceivedSource())));
attachResponse.setTarget(attachMatcher.getReceivedTarget());
}
});
@@ -1007,4 +1009,36 @@ public class TestAmqpPeer implements AutoCloseable
throw new IllegalArgumentException("Unexpected target descriptor: " + descriptor);
}
}
+
+ private Source createSourceObjectFromDescribedType(Object o) {
+ assertThat(o, instanceOf(DescribedType.class));
+ Object described = ((DescribedType) o).getDescribed();
+ assertThat(described, instanceOf(List.class));
+ @SuppressWarnings("unchecked")
+ List<Object> sourceFields = (List<Object>) described;
+
+ return new Source(sourceFields.toArray());
+ }
+
+ private Source trimSourceOutcomesCapabilities(final Source source) {
+ // TODO: this is a workaround for Proton 0.8 compatibility for the tests.
+ // Remove method and update callers when upgrading to 0.9.
+ source.setOutcomes(null);
+ source.setCapabilities(null);
+ return source;
+ }
+
+ private Object trimTargetCapabilities(final Object target) {
+ // TODO: this is a workaround for Proton 0.8 compatibility for the tests.
+ // Remove method and update callers when upgrading to 0.9.
+ if (target instanceof Target) {
+ ((Target) target).setCapabilities(null);
+ } else if (target instanceof Coordinator) {
+ ((Coordinator) target).setCapabilities(null);
+ } else {
+ throw new IllegalArgumentException("Unexpected object type: " + target.getClass());
+ }
+
+ return target;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/6] qpid-jms git commit: change to released ActiveMQ 5.11.0
Posted by ro...@apache.org.
change to released ActiveMQ 5.11.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/046b0531
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/046b0531
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/046b0531
Branch: refs/heads/master
Commit: 046b0531aa0cfb1328f571036a991e0403ef8466
Parents: 99ef526
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Feb 4 11:53:01 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Feb 4 11:53:01 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/046b0531/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48a5691..5dba796 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<!-- Dependency Versions for this Project -->
<junit-version>4.12</junit-version>
<slf4j-version>1.7.10</slf4j-version>
- <activemq-version>5.11-SNAPSHOT</activemq-version>
+ <activemq-version>5.11.0</activemq-version>
<proton-version>0.8</proton-version>
<fuse-joram-tests-version>1.0</fuse-joram-tests-version>
<jetty-version>8.1.16.v20140903</jetty-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/6] qpid-jms git commit: create the correct type of target,
which can differ based on the context
Posted by ro...@apache.org.
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
[5/6] qpid-jms git commit: use correct field in getter
Posted by ro...@apache.org.
use correct field in getter
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f0dd9de2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f0dd9de2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f0dd9de2
Branch: refs/heads/master
Commit: f0dd9de27e01119a832fd0b621f598b63a42220c
Parents: 046b053
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Feb 4 12:16:43 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Feb 4 12:16:43 2015 +0000
----------------------------------------------------------------------
.../org/apache/qpid/jms/provider/failover/FailoverProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f0dd9de2/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index c4ae820..8f623b7 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -701,7 +701,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
}
public long getReconnectDelay() {
- return initialReconnectDelay;
+ return reconnectDelay;
}
public void setReconnectDelay(long reconnectDealy) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org