You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/07/09 08:24:53 UTC
svn commit: r792408 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/ main/java/org/apache/camel/component/file/
main/java/org/apache/camel/impl/ main/java/org/apache/camel/processor/
main/java/org/apache/camel/processor/interceptor/ test/j...
Author: davsclaus
Date: Thu Jul 9 06:24:53 2009
New Revision: 792408
URL: http://svn.apache.org/viewvc?rev=792408&view=rev
Log:
CAMEL-316: A little API cleanup.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.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/ProducerCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.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=792408&r1=792407&r2=792408&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 Thu Jul 9 06:24:53 2009
@@ -242,9 +242,11 @@
Message getFault(boolean lazyCreate);
/**
- * Removes the fault message.
+ * Sets the fault message
+ *
+ * @param fault the fault message
*/
- void removeFault();
+ void setFault(Message fault);
/**
* Returns the exception associated with this exchange
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=792408&r1=792407&r2=792408&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Thu Jul 9 06:24:53 2009
@@ -102,10 +102,6 @@
return exchange;
}
- public Exchange createExchange() {
- return new DefaultExchange(this);
- }
-
public File getFile() {
return file;
}
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=792408&r1=792407&r2=792408&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 Thu Jul 9 06:24:53 2009
@@ -287,10 +287,6 @@
configureMessage(fault);
}
- public void removeFault() {
- this.fault = null;
- }
-
public String getExchangeId() {
if (exchangeId == null) {
exchangeId = createExchangeId();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java?rev=792408&r1=792407&r2=792408&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java Thu Jul 9 06:24:53 2009
@@ -209,7 +209,7 @@
}
protected void doStop() throws Exception {
- ServiceHelper.stopServices(producers.values());
+ // the producers will be stopped from where they are acquired
producers.clear();
ServiceHelper.stopServices(pool);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java?rev=792408&r1=792407&r2=792408&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java Thu Jul 9 06:24:53 2009
@@ -135,8 +135,7 @@
* @return created exchange.
*/
protected Exchange createResourceExchange(Exchange source, ExchangePattern pattern) {
- DefaultExchange target = new DefaultExchange(source.getContext());
- target.copyFrom(source);
+ Exchange target = source.copy();
target.setPattern(pattern);
return target;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java?rev=792408&r1=792407&r2=792408&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java Thu Jul 9 06:24:53 2009
@@ -165,8 +165,7 @@
* @return created exchange.
*/
protected Exchange createResourceExchange(Exchange source, ExchangePattern pattern) {
- DefaultExchange target = new DefaultExchange(source.getContext());
- target.copyFrom(source);
+ Exchange target = source.copy();
target.setPattern(pattern);
return target;
}
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=792408&r1=792407&r2=792408&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 Thu Jul 9 06:24:53 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.removeFault();
+ exchange.setFault(null);
if (faultBody instanceof Exception) {
exchange.setException((Exception) faultBody);
} else {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java?rev=792408&r1=792407&r2=792408&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java Thu Jul 9 06:24:53 2009
@@ -51,7 +51,7 @@
mock.assertIsSatisfied();
// give a little time for on completion to delete the file
- Thread.sleep(100);
+ Thread.sleep(1000);
assertFalse("File should been deleted", new File("target/files/report.txt").getAbsoluteFile().exists());
}