You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2007/11/29 04:54:55 UTC

svn commit: r599255 - in /incubator/qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/ perftests/src/main/java/org/apache/qpid/client/perf/

Author: rajith
Date: Wed Nov 28 19:54:53 2007
New Revision: 599255

URL: http://svn.apache.org/viewvc?rev=599255&view=rev
Log:
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

Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
    incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=599255&r1=599254&r2=599255&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Wed Nov 28 19:54:53 2007
@@ -60,7 +60,7 @@
     /**
      * 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 @@
 
         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

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=599255&r1=599254&r2=599255&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Wed Nov 28 19:54:53 2007
@@ -230,10 +230,10 @@
     {
         // 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)

Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java?rev=599255&r1=599254&r2=599255&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSAsyncConsumer.java Wed Nov 28 19:54:53 2007
@@ -67,6 +67,7 @@
             {
                 _logger.error("Error : Message received out of order in JMSSyncConsumer:" + _id + " message id was " + msgId + " expected: " + _currentMsgCount+1);
             }
+            message = null;
             _currentMsgCount ++;
         }
         catch(Exception e)