You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2007/06/25 14:40:26 UTC
svn commit: r550472 - in /activemq/trunk/activemq-ra/src:
main/java/org/apache/activemq/ra/ test/java/org/apache/activemq/ra/
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);