svn commit: r630847 - in /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache: qpid/client/BasicMessageConsumer.java qpid/client/BasicMessageConsumer_0_10.java qpidity/nclient/impl/Constants.java

[ar...@apache.org]

Author: arnaudsimon
Date: Mon Feb 25 05:45:53 2008
New Revision: 630847

URL: http://svn.apache.org/viewvc?rev=630847&view=rev
Log:
Changed checkPreConditions for accessing directly to _messageSelector

Added:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java
Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=630847&r1=630846&r2=630847&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Mon Feb 25 05:45:53 2008
@@ -54,7 +54,7 @@
      */
     protected AMQConnection _connection;
 
-    private String _messageSelector;
+    protected String _messageSelector;
 
     private boolean _noLocal;
 
@@ -658,6 +658,8 @@
             }
             else
             {
+                // we should not be allowed to add a message is the
+                // consumer is closed
                 _synchronousQueue.put(jmsMessage);
             }
         }

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=630847&r1=630846&r2=630847&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 Mon Feb 25 05:45:53 2008
@@ -38,7 +38,6 @@
 import javax.jms.MessageListener;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.Iterator;
 
 /**
@@ -290,7 +289,7 @@
         // TODO Use a tag for fiding out if message filtering is done here or by the broker.
         try
         {
-            if (getMessageSelector() != null && !getMessageSelector().equals(""))
+            if (_messageSelector != null && !_messageSelector.equals(""))
             {
                 messageOk = _filter.matches(message);
             }

Added: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java?rev=630847&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java (added)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java Mon Feb 25 05:45:53 2008
@@ -0,0 +1,78 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpidity.nclient.impl;
+
+/**
+ * This class holds all the 0.10 client constants which value can be set
+ * through properties.
+ */
+public class Constants
+{
+    static
+    {
+
+        String max="message_size_before_sync";// KB's
+        try
+        {
+            MAX_NOT_SYNC_DATA_LENGH=new Long(System.getProperties().getProperty(max, "200000000"));
+        }
+        catch (NumberFormatException e)
+        {
+            // use default size
+            MAX_NOT_SYNC_DATA_LENGH=200000000;
+        }
+        String flush="message_size_before_flush";
+        try
+        {
+            MAX_NOT_FLUSH_DATA_LENGH=new Long(System.getProperties().getProperty(flush, "2000000"));
+        }
+        catch (NumberFormatException e)
+        {
+            // use default size
+            MAX_NOT_FLUSH_DATA_LENGH=20000000;
+        }
+    }
+
+    /**
+     * The total message size in KBs that can be transferted before
+     * client and broker are synchronized.
+     * A sync will result in the client library releasing the sent messages
+     * from memory. (messages are kept
+     * in memory so client can reconnect to a broker in the event of a failure)
+     * <p>
+     * Property name: message_size_before_sync
+     * <p>
+     * Default value: 200000000
+     */
+    public static long MAX_NOT_SYNC_DATA_LENGH;
+    /**
+     * The total message size in KBs that can be transferted before
+     * messages are flushed.
+     * When a flush returns all messages have reached the broker.
+     * <p>
+     * Property name: message_size_before_flush
+     * <p>
+     * Default value: 200000000 
+     */
+    public static long MAX_NOT_FLUSH_DATA_LENGH;
+
+}