Setting the message to null to mark for garbage collection

noAck still has to clear our internal command ids.
increased the default max prefetch to 1000


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

3 files changed, 8 insertions, 4 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index c809ec04d9..81ba795fa4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -60,7 +60,7 @@ public class AMQSession_0_10 extends AMQSession
     /**
      * The maximum number of pre-fetched messages per destination
      */
-    public static final long MAX_PREFETCH = 100;
+    public static long MAX_PREFETCH = 1000;
 
     /**
      * The underlying QpidSession
@@ -98,6 +98,9 @@ public class AMQSession_0_10 extends AMQSession
 
         super(con, channelId, transacted, acknowledgeMode, messageFactoryRegistry, defaultPrefetchHighMark,
               defaultPrefetchLowMark);
+
+        MAX_PREFETCH = Integer.parseInt(System.getProperty("max_prefetch","1000"));
+
         // create the qpid session with an expiry  <= 0 so that the session does not expire
         _qpidSession = qpidConnection.createSession(0);
         // set the exception listnere for this session
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index 6e9b145896..e1a3d15a78 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -230,10 +230,10 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
     {
         // notify the session
         ((AMQSession_0_10) getSession()).addMessageTag(msg.getDeliveryTag());
-        if (!Boolean.getBoolean("noAck"))
-        {
+        //if (!Boolean.getBoolean("noAck"))
+        //{
             super.postDeliver(msg);
-        }
+        //}
     }
 
     void notifyMessage(UnprocessedMessage messageFrame, int channelId)
diff --git a/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java b/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java
index f0d10ec144..3f21a3f0a6 100644
--- a/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java
+++ b/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java
@@ -67,6 +67,7 @@ public class JMSAsyncConsumer implements MessageListener, JMSConsumer
             {
                 _logger.error("Error : Message received out of order in JMSSyncConsumer:" + _id + " message id was " + msgId + " expected: " + _currentMsgCount+1);
             }
+            message = null;
             _currentMsgCount ++;
         }
         catch(Exception e)