You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/02/13 13:03:38 UTC

svn commit: r506981 - in /incubator/qpid/branches/perftesting/qpid/java: broker/src/main/java/org/apache/qpid/server/AMQChannel.java distribution/pom.xml

Author: ritchiem
Date: Tue Feb 13 04:03:29 2007
New Revision: 506981

URL: http://svn.apache.org/viewvc?view=rev&rev=506981
Log:
Updated guard on AMQChannel error output to handle case where there are still consumers whilst processing unacked map requeue

Modified:
    incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml

Modified: incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=506981&r1=506980&r2=506981
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Tue Feb 13 04:03:29 2007
@@ -411,9 +411,9 @@
             }
         }
 
-        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");
         }
     }
 

Modified: incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml?view=diff&rev=506981&r1=506980&r2=506981
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml Tue Feb 13 04:03:29 2007
@@ -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>