You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2015/05/03 17:08:28 UTC
activemq git commit: AMQ-5699: upgrade to Proton 0.9.1 release
Repository: activemq
Updated Branches:
refs/heads/master f05f83b15 -> b77eba471
AMQ-5699: upgrade to Proton 0.9.1 release
https://issues.apache.org/jira/browse/AMQ-5699
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b77eba47
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b77eba47
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b77eba47
Branch: refs/heads/master
Commit: b77eba471deadedf2dacd85b440539bfa897701b
Parents: f05f83b
Author: Robert Gemmell <ro...@apache.org>
Authored: Sun May 3 15:11:31 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Sun May 3 15:12:44 2015 +0100
----------------------------------------------------------------------
.../amqp/client/util/UnmodifiableConnection.java | 12 ++++++++++++
pom.xml | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b77eba47/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
index b67b305..58249a7 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
@@ -27,6 +27,7 @@ import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Session;
+import org.apache.qpid.proton.engine.Transport;
/**
* Unmodifiable Connection wrapper used to prevent test code from accidentally
@@ -176,4 +177,15 @@ public class UnmodifiableConnection implements Connection {
public void collect(Collector collector) {
throw new UnsupportedOperationException("Cannot alter the Connection");
}
+
+ @Override
+ public Transport getTransport() {
+ return connection.getTransport();
+ }
+
+ @Override
+ public String getContainer()
+ {
+ return connection.getContainer();
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/b77eba47/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4401421..034b754 100755
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
<p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.6</zookeeper-version>
- <qpid-proton-version>0.8</qpid-proton-version>
+ <qpid-proton-version>0.9.1</qpid-proton-version>
<qpid-jms-version>0.1.0</qpid-jms-version>
<netty-all-version>4.0.17.Final</netty-all-version>
<regexp-version>1.3</regexp-version>