QPID-2002 : Added new message CHN-1004, to allow the reporting of prefetch sizes.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@802625 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 21 insertions, 8 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 2a46ee53b4..add5e64ee8 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
@@ -884,8 +884,7 @@ public class AMQChannel
 
     public void setCredit(final long prefetchSize, final int prefetchCount)
     {
-        //fixme
-//        _actor.message(ChannelMessages.CHN_100X(prefetchSize, prefetchCount);
+        _actor.message(ChannelMessages.CHN_1004(prefetchSize, prefetchCount));
         _creditManager.setCreditLimits(prefetchSize, prefetchCount);
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
index 24df17683f..d2a5810f3b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
@@ -240,10 +240,12 @@ CON-1002 = Close
 
 #Channel
 CHN-1001 = Create
-#  : Prefetch Size {0,number} : Count {1,number}
 # 0 - flow
 CHN-1002 = Flow {0}
 CHN-1003 = Close
+# 0 - bytes allowed in prefetch
+# 1 - number of messagse. 
+CHN-1004 = Prefetch Size (bytes) {0,number} : Count {1,number}
 
 #Queue
 # 0 - owner
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
index da3f458cef..ea0199570c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.logging;
 
+import org.apache.qpid.client.AMQConnection;
+
 import javax.jms.Connection;
 import javax.jms.MessageConsumer;
 import javax.jms.Queue;
@@ -52,11 +54,12 @@ public class ChannelLoggingTest extends AbstractTestLogging
      * 2. New JMS Session/Channel creation
      *
      * Output:
-     * <date> CHN-1001 : Create : Prefetch <count>
+     * <date> CHN-1001 : Create
+     * <date> CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}
      *
      * Validation Steps:
-     * 3. The CHN ID is correct
-     * 4. The prefetch value matches that defined by the requesting client.
+     * 1. The CHN ID is correct
+     * 2. The prefetch value matches that defined by the requesting client.
      *
      * @throws Exception - if an error occurs
      */
@@ -66,14 +69,16 @@ public class ChannelLoggingTest extends AbstractTestLogging
 
         Connection connection = getConnection();
 
+        int PREFETCH = 12;
+
         // Test that calling session.close gives us the expected output
-        connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        ((AMQConnection)connection).createSession(false, Session.AUTO_ACKNOWLEDGE,PREFETCH);
 
         List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
 
         // Validation
 
-        assertEquals("CHN messages not logged", 1, results.size());
+        assertEquals("CHN messages not logged", 2, results.size());
 
         String log = getLog(results.get(0));
         //  MESSAGE [con:0(guest@anonymous(3273383)/test)/ch:1] CHN-1001 : Create
@@ -81,6 +86,13 @@ public class ChannelLoggingTest extends AbstractTestLogging
         validateMessageID("CHN-1001", log);
         assertEquals("Incorrect Channel in actor:"+fromActor(log), 1, getChannelID(fromActor(log)));
 
+        log = getLog(results.get(1));
+        //  MESSAGE [con:0(guest@anonymous(3273383)/test)/ch:1] CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}
+        //1 & 2
+        validateMessageID("CHN-1004", log);
+        assertEquals("Incorrect Channel in actor:"+fromActor(log), 1, getChannelID(fromActor(log)));
+        assertTrue("Prefetch Count not correct",getMessageString(fromMessage(log)).endsWith("Count "+PREFETCH));
+
         connection.close();
     }