You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/06/12 09:55:26 UTC
svn commit: r784022 - in
/servicemix/components/bindings/servicemix-jms/trunk/src:
main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java
test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java
Author: ccustine
Date: Fri Jun 12 07:55:25 2009
New Revision: 784022
URL: http://svn.apache.org/viewvc?rev=784022&view=rev
Log:
SMXCOMP-565 - JMS consumer marshaler rollBackOnError flag is overwritten
Modified:
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java
servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java?rev=784022&r1=784021&r2=784022&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java Fri Jun 12 07:55:25 2009
@@ -80,7 +80,7 @@
}
public boolean isRollbackOnError() {
- return (rollbackConfigured ? rollbackOnError : rollbackOnErrorDefault);
+ return rollbackConfigured ? rollbackOnError : rollbackOnErrorDefault;
}
/**
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java?rev=784022&r1=784021&r2=784022&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java Fri Jun 12 07:55:25 2009
@@ -267,7 +267,8 @@
return endpoint;
}
- private JmsConsumerEndpoint createInOnlyConsumerEndpointWithConfiguredRollback(ConnectionFactory connFactory, boolean rollbackOnError) throws URISyntaxException {
+ private JmsConsumerEndpoint createInOnlyConsumerEndpointWithConfiguredRollback(ConnectionFactory connFactory,
+ boolean rollbackOnError) throws URISyntaxException {
JmsConsumerEndpoint endpoint = new JmsConsumerEndpoint();
endpoint.setService(new QName("http://jms.servicemix.org/Test", "Consumer"));
endpoint.setEndpoint("endpoint");