Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 41875 invoked from network); 21 Mar 2007 12:51:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Mar 2007 12:51:31 -0000 Received: (qmail 54235 invoked by uid 500); 21 Mar 2007 12:51:39 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 54217 invoked by uid 500); 21 Mar 2007 12:51:38 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 54208 invoked by uid 99); 21 Mar 2007 12:51:38 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 05:51:38 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 05:51:30 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6DC601A983E; Wed, 21 Mar 2007 05:51:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r520865 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: broker/region/QueueSubscription.java command/ActiveMQMessage.java Date: Wed, 21 Mar 2007 12:51:10 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070321125110.6DC601A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Wed Mar 21 05:51:09 2007 New Revision: 520865 URL: http://svn.apache.org/viewvc?view=rev&rev=520865 Log: fixes for LargeStreamletTest Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java?view=diff&rev=520865&r1=520864&r2=520865 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java Wed Mar 21 05:51:09 2007 @@ -131,7 +131,7 @@ if (message instanceof ActiveMQMessage) { ActiveMQMessage activeMessage = (ActiveMQMessage) message; try { - activeMessage.setBooleanProperty("JMSXGroupFirstForConsumer", true); + activeMessage.setBooleanProperty("JMSXGroupFirstForConsumer", true, false); } catch (JMSException e) { log.warn("Failed to set boolean header: " + e, e); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java?view=diff&rev=520865&r1=520864&r2=520865 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java Wed Mar 21 05:51:09 2007 @@ -381,9 +381,16 @@ } }); } + + public void setObjectProperty(String name, Object value) throws JMSException{ + setObjectProperty(name,value,true); + } - public void setObjectProperty(String name, Object value) throws JMSException { - checkReadOnlyProperties(); + public void setObjectProperty(String name, Object value, boolean checkReadOnly) throws JMSException { + + if (checkReadOnly) { + checkReadOnlyProperties(); + } if (name == null || name.equals("")) { throw new IllegalArgumentException("Property name cannot be empty or null"); } @@ -535,7 +542,10 @@ } public void setBooleanProperty(String name, boolean value) throws JMSException { - setObjectProperty(name, value ? Boolean.TRUE : Boolean.FALSE); + setBooleanProperty(name,value,true); + } + public void setBooleanProperty(String name, boolean value,boolean checkReadOnly) throws JMSException { + setObjectProperty(name, value ? Boolean.TRUE : Boolean.FALSE,checkReadOnly); } public void setByteProperty(String name, byte value) throws JMSException {