Author: cschneider
Date: Fri Aug 26 10:35:07 2011
New Revision: 1162057
URL: http://svn.apache.org/viewvc?rev=1162057&view=rev
Log:
Make createException delegate to CamelExchangeException and set method as
deprecated
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
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=1162057&r1=1162056&r2=1162057&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
Fri Aug 26 10:35:07 2011
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.apache.camel.CamelContext;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -635,33 +636,15 @@ public final class ExchangeHelper {
}
/**
- * Creates an exception message with the provided details.
- * <p/>
- * All fields is optional so you can pass in only an exception, or just a
message etc. or any combination.
- *
- * @param message the message
- * @param exchange the exchange
- * @param cause the caused exception
- * @return an error message (without stacktrace from exception)
+ * @deprecated use
org.apache.camel.CamelExchangeException.createExceptionMessage instead
+ * @param message
+ * @param exchange
+ * @param cause
+ * @return
*/
+ @Deprecated
public static String createExceptionMessage(String message, Exchange
exchange, Throwable cause) {
- StringBuilder sb = new StringBuilder();
- if (message != null) {
- sb.append(message);
- }
- if (exchange != null) {
- if (sb.length() > 0) {
- sb.append(". ");
- }
- sb.append(exchange);
- }
- if (cause != null) {
- if (sb.length() > 0) {
- sb.append(". ");
- }
- sb.append("Caused by: [" + cause.getClass().getName() + " - " +
cause.getMessage() + "]");
- }
- return sb.toString().trim();
+ return CamelExchangeException.createExceptionMessage(message, exchange,
cause);
}
/**
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=1162057&r1=1162056&r2=1162057&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
Fri Aug 26 10:35:07 2011
@@ -18,6 +18,7 @@ package org.apache.camel.component.quart
import java.util.Date;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -26,7 +27,6 @@ import org.apache.camel.impl.DefaultEndp
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.quartz.JobDetail;
@@ -117,7 +117,7 @@ public class QuartzEndpoint extends Defa
}
} catch (Exception e) {
// log the error
- LOG.error(ExchangeHelper.createExceptionMessage("Error processing
exchange", exchange, e));
+ LOG.error(CamelExchangeException.createExceptionMessage("Error
processing exchange", exchange, e));
// and rethrow to let quartz handle it
if (e instanceof JobExecutionException) {
