Author: hadrian
Date: Wed Jul 29 03:06:04 2009
New Revision: 798763
URL: http://svn.apache.org/viewvc?rev=798763&view=rev
Log:
CAMEL-316. Remove 2 out of 3 Fault apis.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=798763&r1=798762&r2=798763&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Wed Jul
29 03:06:04 2009
@@ -234,23 +234,6 @@
boolean hasFault();
/**
- * Returns the fault message; optionally lazily creating one if one has
- * not been associated with this exchange
- *
- * @param lazyCreate <tt>true</tt> will lazy create the fault message
- * @return the fault
- * @deprecated use {...@link #hasFault()} or {...@link #getFault()}. Will
be remove in Camel 2.0 GA.
- */
- Message getFault(boolean lazyCreate);
-
- /**
- * Sets the fault message
- *
- * @param fault the fault message
- */
- void setFault(Message fault);
-
- /**
* Returns the exception associated with this exchange
*
* @return the exception (or null if no faults)
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=798763&r1=798762&r2=798763&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 03:06:04 2009
@@ -270,24 +270,13 @@
}
public Message getFault() {
- return getFault(true);
- }
-
- public Message getFault(boolean lazyCreate) {
- Message fault = getOut(lazyCreate);
+ Message fault = getOut(true);
if (fault != null) {
fault.setFault(true);
}
return fault;
}
- public void setFault(Message fault) {
- if (fault != null) {
- fault.setFault(true);
- }
- setOut(fault);
- }
-
public String getExchangeId() {
if (exchangeId == null) {
exchangeId = createExchangeId();
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java?rev=798763&r1=798762&r2=798763&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
Wed Jul 29 03:06:04 2009
@@ -61,7 +61,7 @@
final Object faultBody = exchange.getFault().getBody();
if (faultBody != null && exchange.getException() == null) {
// remove fault as we are converting it to an exception
- exchange.setFault(null);
+ exchange.setOut(null);
if (faultBody instanceof Exception) {
exchange.setException((Exception) faultBody);
} else {
