Author: hadrian
Date: Wed Jul 29 19:32:20 2009
New Revision: 799029
URL: http://svn.apache.org/viewvc?rev=799029&view=rev
Log:
CAMEL-316. Incremental cleanup.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
Wed Jul 29 19:32:20 2009
@@ -164,16 +164,6 @@
}
protected boolean hasFaultMessage(Exchange result) {
- if (result.hasFault()) {
- Message faultMessage = result.getFault();
- if (faultMessage != null) {
- Object faultBody = faultMessage.getBody();
- if (faultBody != null) {
- return true;
- }
- }
- }
- return false;
+ return result.hasOut() && result.getOut().isFault() &&
result.getOut().getBody() != null;
}
-
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
Wed Jul 29 19:32:20 2009
@@ -112,9 +112,6 @@
if (exchange.hasOut()) {
safeCopy(getOut(), exchange.getOut());
}
- if (exchange.hasFault()) {
- safeCopy(getFault(), exchange.getFault());
- }
setException(exchange.getException());
unitOfWork = exchange.getUnitOfWork();
@@ -289,13 +286,7 @@
}
public boolean isFailed() {
- if (hasFault()) {
- Object faultBody = getFault().getBody();
- if (faultBody != null) {
- return true;
- }
- }
- return getException() != null;
+ return (hasOut() && getOut().isFault()) || getException() != null;
}
public boolean isTransacted() {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
Wed Jul 29 19:32:20 2009
@@ -22,6 +22,7 @@
import javax.activation.DataHandler;
import org.apache.camel.Exchange;
+import org.apache.camel.Message;
import org.apache.camel.util.MessageHelper;
/**
@@ -39,6 +40,12 @@
return MessageHelper.extractBodyForLogging(this);
}
+ @Override
+ public void copyFrom(Message that) {
+ super.copyFrom(that);
+ fault = that.isFault();
+ }
+
public boolean isFault() {
return fault;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
Wed Jul 29 19:32:20 2009
@@ -243,16 +243,12 @@
result.getIn().copyFrom(source.getIn());
// copy out message
- if (source.hasOut() && !source.getOut().isFault()) {
+ if (source.hasOut()) {
// exchange pattern sensitive
- getResultMessage(result).copyFrom(source.getOut());
+ Message resultMessage = source.getOut().isFault() ?
result.getOut(true) : getResultMessage(result);
+ resultMessage.copyFrom(source.getOut());
}
-
- // copy fault message
- if (source.hasFault()) {
- result.getFault().copyFrom(source.getFault());
- }
-
+
// copy exception
result.setException(source.getException());
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
Wed Jul 29 19:32:20 2009
@@ -62,7 +62,7 @@
});
assertMockEndpointsSatisfied();
- assertFalse("Fault should be removed", response.hasFault());
+ assertFalse("Fault should be removed", response.hasOut());
assertNotNull("Should have exception", response.getException());
assertEquals("fault", response.getException().getMessage());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
Wed Jul 29 19:32:20 2009
@@ -73,7 +73,6 @@
mock.assertIsSatisfied();
assertEquals("test", exchange.getIn().getBody());
assertEquals("failed", exchange.getException().getMessage());
- assertFalse(exchange.hasFault());
assertFalse(exchange.hasOut());
}
@@ -95,7 +94,7 @@
});
assertEquals("bar", exchange.getIn().getHeader("foo"));
assertEquals("test:blah", exchange.getIn().getBody());
- assertFalse(exchange.hasFault());
+ assertFalse(exchange.hasOut());
assertNull(exchange.getException());
}
@@ -118,7 +117,6 @@
});
assertEquals("test", exchange.getIn().getBody());
assertEquals("failed", exchange.getException().getMessage());
- assertFalse(exchange.hasFault());
assertFalse(exchange.hasOut());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
Wed Jul 29 19:32:20 2009
@@ -111,7 +111,7 @@
});
assertEquals("bar", exchange.getIn().getHeader("foo"));
assertEquals("test:blah", exchange.getIn().getBody());
- assertFalse(exchange.hasFault());
+ assertFalse(exchange.hasOut() && exchange.getOut().isFault());
assertNull(exchange.getException());
}
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=799029&r1=799028&r2=799029&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
Wed Jul 29 19:32:20 2009
@@ -103,10 +103,11 @@
public void writeResponse(Exchange exchange, HttpServletResponse response)
throws IOException {
if (exchange.isFailed()) {
- if (exchange.hasFault()) {
- doWriteFaultResponse(exchange.getFault(), response, exchange);
- } else {
+ if (exchange.getException() != null) {
doWriteExceptionResponse(exchange.getException(), response);
+ } else {
+ // it must be a fault, no need to check for the fault flag on
the message
+ doWriteFaultResponse(exchange.getOut(), response, exchange);
}
} else {
// just copy the protocol relates header
