diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-02-13 12:03:29 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-02-13 12:03:29 +0000 |
| commit | b4b42b55d78674660d31609c40022988ddb8e318 (patch) | |
| tree | 33a42f83042b2628d870b23eced69673d389f4bb | |
| parent | e5bfc8147642478c9c54021057602a8a45de89e7 (diff) | |
| download | qpid-python-b4b42b55d78674660d31609c40022988ddb8e318.tar.gz | |
Updated guard on AMQChannel error output to handle case where there are still consumers whilst processing unacked map requeue
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting@506981 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 4 | ||||
| -rw-r--r-- | qpid/java/distribution/pom.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java index 4b029f88c6..e056af55cf 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java @@ -411,9 +411,9 @@ public class AMQChannel } } - if (_unacknowledgedMessageMap.size() != 0) + if (_consumerTag2QueueMap.size() == 0 && _unacknowledgedMessageMap.size() != 0) { - _log.error("unack map is not empty after resend was item added to unack map whilst consumer is closing"); + _log.error("unack map is not empty after resend was item added to unack map whilst closing last consumer"); } } diff --git a/qpid/java/distribution/pom.xml b/qpid/java/distribution/pom.xml index 840be4b688..a63d1f3b71 100644 --- a/qpid/java/distribution/pom.xml +++ b/qpid/java/distribution/pom.xml @@ -38,7 +38,7 @@ <java.source.version>1.5</java.source.version> <qpid.version>${pom.version}</qpid.version> <qpid.targetDir>${project.build.directory}</qpid.targetDir> - <release.revision>-r506980</release.revision> + <release.revision>-r506981</release.revision> </properties> <repositories> |