You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/15 15:37:46 UTC
[1/2] qpid-jms-amqp-0-x git commit: QPID-8033: [Qpid JMS AMQP 0-x]
Notify state waiters on any exception thrown whilst handling incoming frames
Repository: qpid-jms-amqp-0-x
Updated Branches:
refs/heads/master 9aea5431e -> f6f03f37b
QPID-8033: [Qpid JMS AMQP 0-x] Notify state waiters on any exception thrown whilst handling incoming frames
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/3d2a6f28
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/3d2a6f28
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/3d2a6f28
Branch: refs/heads/master
Commit: 3d2a6f282f0ff78bea377a2d2e8dc2a0dad7c7ae
Parents: 9aea543
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Nov 15 14:36:24 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Nov 15 14:39:37 2017 +0000
----------------------------------------------------------------------
.../main/java/org/apache/qpid/client/AMQProtocolHandler.java | 3 ++-
.../java/org/apache/qpid/client/state/AMQStateManager.java | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/3d2a6f28/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java b/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
index f8ec8a8..5d59e50 100644
--- a/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
+++ b/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
@@ -508,6 +508,7 @@ public class AMQProtocolHandler implements ExceptionHandlingByteBufferReceiver,
{
_logger.error("Exception processing frame", e);
propagateExceptionToFrameListeners(e);
+ _stateManager.propagateExceptionToStateWaiters(e);
exception(e);
}
finally
@@ -551,7 +552,7 @@ public class AMQProtocolHandler implements ExceptionHandlingByteBufferReceiver,
catch (QpidException e)
{
propagateExceptionToFrameListeners(e);
-
+ _stateManager.propagateExceptionToStateWaiters(e);
exception(e);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/3d2a6f28/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java b/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
index 5bc26a6..3a5fcc4 100644
--- a/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
+++ b/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
@@ -166,9 +166,14 @@ public class AMQStateManager implements AMQMethodListener
_logger.info("No Waiters for error. Saving as last error:" + error.getMessage());
_lastException = error;
}
+ propagateExceptionToStateWaiters(error);
+ }
+
+ public void propagateExceptionToStateWaiters(final Exception error)
+ {
for (StateWaiter waiter : _waiters)
{
- if(_logger.isDebugEnabled())
+ if (_logger.isDebugEnabled())
{
_logger.debug("Notifying waiter " + waiter + " for error:" + error.getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms-amqp-0-x git commit: QPID-8034: [QPID JMS AMQP 0-x]
Fix dependency check
Posted by or...@apache.org.
QPID-8034: [QPID JMS AMQP 0-x] Fix dependency check
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/f6f03f37
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/f6f03f37
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/f6f03f37
Branch: refs/heads/master
Commit: f6f03f37ba16d254717c7e2b2461c1c956049b99
Parents: 3d2a6f2
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Nov 15 15:37:06 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Nov 15 15:37:06 2017 +0000
----------------------------------------------------------------------
.../assembly/dependency-verification/DEPENDENCIES_REFERENCE | 6 +++++-
client/pom.xml | 1 -
pom.xml | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/f6f03f37/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index c1be04c..d7051de 100644
--- a/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -21,13 +21,17 @@
# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
#// ------------------------------------------------------------------
-Apache Qpid JMS Client for AMQP 0-9-1/0-10
+Apache Qpid JMS AMQP 0-x Bundles
From: 'QOS.ch' (http://www.qos.ch)
- SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+From: 'The Apache Software Foundation' (https://www.apache.org/)
+ - Apache Qpid JMS AMQP 0-x (http://qpid.apache.org/components/qpid-client) org.apache.qpid:qpid-client:jar
+ License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
+
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/f6f03f37/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 4537726..8849183 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -29,7 +29,6 @@
<description>JMS client supporting AMQP 0-8, 0-9, 0-9-1 and 0-10.</description>
<properties>
- <dependency-change-verification>true</dependency-change-verification>
<qpid.name>qpid</qpid.name>
<qpid.version>${project.version}</qpid.version>
<qpid.version.suffix />
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/f6f03f37/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1eb15c..e61ba6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,7 +520,7 @@
# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
#
</header>
- <path path="${project.build.outputDirectory}/META-INF/DEPENDENCIES" />
+ <path path="${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES" />
</concat>
<replaceregexp file="${dependency-verification-output-file}" flags="gm" replace="">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org