[jboss-cvs] JBoss Messaging SVN: r4217 - in trunk/src: main/org/jboss/messaging/core/client/impl and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2008-05-16 07:26:27 -0400 (Fri, 16 May 2008)
New Revision: 4217

Modified:
   trunk/src/config/jbm-configuration.xml
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
   trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
   trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
Log:
Changed MINA queue block settings


Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2008-05-16 11:02:18 UTC (rev 4216)
+++ trunk/src/config/jbm-configuration.xml	2008-05-16 11:26:27 UTC (rev 4217)
@@ -44,9 +44,9 @@
       
       <remoting-writequeue-block-timeout>10000</remoting-writequeue-block-timeout>
       
-      <remoting-writequeue-minbytes>65536</remoting-writequeue-minbytes>
+      <remoting-writequeue-minbytes>32768</remoting-writequeue-minbytes>
       
-      <remoting-writequeue-maxbytes>1048576</remoting-writequeue-maxbytes>
+      <remoting-writequeue-maxbytes>65536</remoting-writequeue-maxbytes>
       
       <!--  if ssl is enabled, all remoting-ssl-* properties must be set -->
       <remoting-enable-ssl>false</remoting-enable-ssl>

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-05-16 11:02:18 UTC (rev 4216)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-05-16 11:26:27 UTC (rev 4217)
@@ -241,8 +241,6 @@
          return;
       }
       
-      log.info("** max size is " + this.maxSize);
-      
       try
       {
          // Now we wait for any current handler runners to run.

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java	2008-05-16 11:02:18 UTC (rev 4216)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java	2008-05-16 11:26:27 UTC (rev 4217)
@@ -45,9 +45,9 @@
    protected String keyStorePassword;
    protected String trustStorePath;
    protected String trustStorePassword;
-   protected long writeQueueBlockTimeout = 5000;
-   protected long writeQueueMinBytes = 65536;
-   protected long writeQueueMaxBytes = 1048576;
+   protected long writeQueueBlockTimeout = 10000;
+   protected long writeQueueMinBytes = 32 * 1024L;
+   protected long writeQueueMaxBytes = 64 * 1024L;
 
    public int getTimeout()
    {

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2008-05-16 11:02:18 UTC (rev 4216)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2008-05-16 11:26:27 UTC (rev 4217)
@@ -82,9 +82,9 @@
       
       writeQueueBlockTimeout = getLong(e, "remoting-writequeue-block-timeout", 10000L);
       
-      writeQueueMinBytes = getLong(e, "remoting-writequeue-minbytes", 65536L);
+      writeQueueMinBytes = getLong(e, "remoting-writequeue-minbytes", 32 * 1024L);
       
-      writeQueueMaxBytes = getLong(e, "remoting-writequeue-maxbytes", 1048576L);
+      writeQueueMaxBytes = getLong(e, "remoting-writequeue-maxbytes", 64 * 1024L);
 
       sslEnabled = getBoolean(e, "remoting-enable-ssl", false);
       

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java	2008-05-16 11:02:18 UTC (rev 4216)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java	2008-05-16 11:26:27 UTC (rev 4217)
@@ -171,7 +171,7 @@
       deliver();
    }
  
-   //private volatile int count = 0;
+  // private volatile int count = 0;
    
    /*
     * Attempt to deliver all the messages in the queue