You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/11/14 18:01:07 UTC
svn commit: r474869 -
/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
Author: gnodet
Date: Tue Nov 14 09:01:05 2006
New Revision: 474869
URL: http://svn.apache.org/viewvc?view=rev&rev=474869
Log:
SM-376: JcaConsumerProcessor.start() fails after subsequent stop()
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java?view=diff&rev=474869&r1=474868&r2=474869
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java Tue Nov 14 09:01:05 2006
@@ -86,11 +86,12 @@
resourceAdapter = endpoint.getResourceAdapter();
if (resourceAdapter == null) {
resourceAdapter = activationSpec.getResourceAdapter();
+ if (resourceAdapter == null) {
+ throw new IllegalArgumentException("resourceAdapter not set");
+ }
} else if (activationSpec.getResourceAdapter() == null) {
activationSpec.setResourceAdapter(resourceAdapter);
- } else {
- throw new IllegalArgumentException("resourceAdapter not set");
- }
+ }
resourceAdapter.start(bootstrapContext);
resourceAdapter.endpointActivation(endpointFactory, activationSpec);
}