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 2007/11/26 10:03:56 UTC
svn commit: r598172 - in
/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http:
endpoints/HttpConsumerEndpoint.java processors/ConsumerProcessor.java
Author: gnodet
Date: Mon Nov 26 01:03:55 2007
New Revision: 598172
URL: http://svn.apache.org/viewvc?rev=598172&view=rev
Log:
SM-822: java.lang.IllegalStateException: component is not owner, with jmsflow and jcaflow
Modified:
servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
Modified: servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java?rev=598172&r1=598171&r2=598172&view=diff
==============================================================================
--- servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java (original)
+++ servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java Mon Nov 26 01:03:55 2007
@@ -233,8 +233,9 @@
to = ((HttpComponent) getServiceUnit().getComponent()).getConfiguration()
.getConsumerProcessorSuspendTime();
}
+ exchanges.put(exchange.getExchangeId(), exchange);
boolean result = cont.suspend(to);
- exchanges.remove(exchange.getExchangeId());
+ exchange = exchanges.remove(exchange.getExchangeId());
if (!result) {
locks.remove(exchange.getExchangeId());
throw new Exception("Exchange timed out");
Modified: servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java?rev=598172&r1=598171&r2=598172&view=diff
==============================================================================
--- servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java (original)
+++ servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java Mon Nov 26 01:03:55 2007
@@ -159,8 +159,9 @@
if (log.isDebugEnabled()) {
log.debug("Suspending continuation for exchange: " + exchange.getExchangeId());
}
+ exchanges.put(exchange.getExchangeId(), exchange);
boolean result = cont.suspend(suspentionTime);
- exchanges.remove(exchange.getExchangeId());
+ exchange = exchanges.remove(exchange.getExchangeId());
if (!result) {
throw new Exception("Error sending exchange: aborted");
}