Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 75673 invoked from network); 25 Jun 2007 12:40:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jun 2007 12:40:48 -0000 Received: (qmail 76995 invoked by uid 500); 25 Jun 2007 12:40:52 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 76940 invoked by uid 500); 25 Jun 2007 12:40:51 -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 76931 invoked by uid 99); 25 Jun 2007 12:40:51 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2007 05:40:51 -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; Mon, 25 Jun 2007 05:40:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 97C5E1A981C; Mon, 25 Jun 2007 05:40:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r550472 - in /activemq/trunk/activemq-ra/src: main/java/org/apache/activemq/ra/ test/java/org/apache/activemq/ra/ Date: Mon, 25 Jun 2007 12:40:26 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070625124027.97C5E1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Mon Jun 25 05:40:25 2007 New Revision: 550472 URL: http://svn.apache.org/viewvc?view=rev&rev=550472 Log: apply patch http://issues.apache.org/activemq/browse/AMQ-1293 Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java?view=diff&rev=550472&r1=550471&r2=550472 ============================================================================== --- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java (original) +++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java Mon Jun 25 05:40:25 2007 @@ -533,7 +533,7 @@ } public String getMaxMessagesPerSessions() { - return maxMessagesPerSessions.toString(); + return maxMessagesPerSessions; } /** @@ -592,14 +592,14 @@ } public boolean isUseRAManagedTransactionEnabled() { - return new Boolean(useRAManagedTransaction).booleanValue(); + return Boolean.valueOf(useRAManagedTransaction).booleanValue(); } /** * */ public boolean getNoLocalBooleanValue() { - return new Boolean(noLocal).booleanValue(); + return Boolean.valueOf(noLocal).booleanValue(); } public String getEnableBatch() { @@ -616,7 +616,7 @@ } public boolean getEnableBatchBooleanValue() { - return new Boolean(enableBatch).booleanValue(); + return Boolean.valueOf(enableBatch).booleanValue(); } public int getMaxMessagesPerBatchIntValue() { @@ -624,7 +624,7 @@ } public String getMaxMessagesPerBatch() { - return maxMessagesPerBatch.toString(); + return maxMessagesPerBatch; } /** Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java?view=diff&rev=550472&r1=550471&r2=550472 ============================================================================== --- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java (original) +++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java Mon Jun 25 05:40:25 2007 @@ -199,19 +199,19 @@ } public Short getRedeliveryBackOffMultiplier() { - return new Short(redeliveryPolicy().getBackOffMultiplier()); + return Short.valueOf(redeliveryPolicy().getBackOffMultiplier()); } public Long getInitialRedeliveryDelay() { - return new Long(redeliveryPolicy().getInitialRedeliveryDelay()); + return Long.valueOf(redeliveryPolicy().getInitialRedeliveryDelay()); } public Integer getMaximumRedeliveries() { - return new Integer(redeliveryPolicy().getMaximumRedeliveries()); + return Integer.valueOf(redeliveryPolicy().getMaximumRedeliveries()); } public Boolean getRedeliveryUseExponentialBackOff() { - return new Boolean(redeliveryPolicy().isUseExponentialBackOff()); + return Boolean.valueOf(redeliveryPolicy().isUseExponentialBackOff()); } public void setRedeliveryBackOffMultiplier(Short value) { @@ -239,23 +239,23 @@ } public Integer getDurableTopicPrefetch() { - return new Integer(prefetchPolicy().getDurableTopicPrefetch()); + return Integer.valueOf(prefetchPolicy().getDurableTopicPrefetch()); } public Integer getInputStreamPrefetch() { - return new Integer(prefetchPolicy().getInputStreamPrefetch()); + return Integer.valueOf(prefetchPolicy().getInputStreamPrefetch()); } public Integer getQueueBrowserPrefetch() { - return new Integer(prefetchPolicy().getQueueBrowserPrefetch()); + return Integer.valueOf(prefetchPolicy().getQueueBrowserPrefetch()); } public Integer getQueuePrefetch() { - return new Integer(prefetchPolicy().getQueuePrefetch()); + return Integer.valueOf(prefetchPolicy().getQueuePrefetch()); } public Integer getTopicPrefetch() { - return new Integer(prefetchPolicy().getTopicPrefetch()); + return Integer.valueOf(prefetchPolicy().getTopicPrefetch()); } public void setAllPrefetchValues(Integer i) { Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java?view=diff&rev=550472&r1=550471&r2=550472 ============================================================================== --- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java (original) +++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java Mon Jun 25 05:40:25 2007 @@ -68,7 +68,7 @@ if (this == obj) { return true; } - if (obj == null) { + if (obj == null || !(obj instanceof ActiveMQEndpointActivationKey)) { return false; } ActiveMQEndpointActivationKey o = (ActiveMQEndpointActivationKey) obj; Modified: activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java?view=diff&rev=550472&r1=550471&r2=550472 ============================================================================== --- activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java (original) +++ activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java Mon Jun 25 05:40:25 2007 @@ -55,7 +55,7 @@ public class MDBTest extends TestCase { - private final class StubBootstrapContext implements BootstrapContext { + private static final class StubBootstrapContext implements BootstrapContext { public WorkManager getWorkManager() { return new WorkManager() { public void doWork(Work work) throws WorkException { Modified: activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java?view=diff&rev=550472&r1=550471&r2=550472 ============================================================================== --- activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java (original) +++ activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java Mon Jun 25 05:40:25 2007 @@ -51,7 +51,7 @@ public void testInvalidConstruction() { Mock mockEndpoint = new Mock(MessageEndpoint.class); try { - MessageEndpointProxy proxy = new MessageEndpointProxy((MessageEndpoint) mockEndpoint.proxy()); + new MessageEndpointProxy((MessageEndpoint) mockEndpoint.proxy()); fail("An exception should have been thrown"); } catch (IllegalArgumentException e) { assertTrue(true);