Author: davsclaus
Date: Tue Sep 8 13:47:57 2009
New Revision: 812510
URL: http://svn.apache.org/viewvc?rev=812510&view=rev
Log:
Polished code
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CharlesSplitAndTryCatchRollbackIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStopOnExceptionTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
Tue Sep 8 13:47:57 2009
@@ -117,7 +117,7 @@
if (converted != null) {
return converted;
} else {
- LOG.warn(type + " containig object: " + object + " of type: " +
object.getClass().getCanonicalName() + " cannot be serialized, it will be
excluded by the holder");
+ LOG.warn(type + " containing object: " + object + " of type: " +
object.getClass().getCanonicalName() + " cannot be serialized, it will be
excluded by the holder.");
return null;
}
}
@@ -134,7 +134,7 @@
result.put(entry.getKey(), converted);
} else {
LOG.warn(type + " containing object: " + entry.getValue() + "
with key: " + entry.getKey()
- + " cannot be serialized, it will be excluded by the
holder");
+ + " cannot be serialized, it will be excluded by the
holder.");
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
Tue Sep 8 13:47:57 2009
@@ -129,7 +129,7 @@
}
} catch (Exception e) {
// must catch exceptions to ensure all synchronizations
have a chance to run
- LOG.error("Exception occurred during onCompletion. This
exception will be ignored: ", e);
+ LOG.warn("Exception occurred during onCompletion. This
exception will be ignored: ", e);
}
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Tue Sep 8 13:47:57 2009
@@ -127,7 +127,7 @@
if (isParallelProcessing()) {
doProcessParallel(result, pairs, isStreaming());
} else {
- doProcessSequntial(result, pairs);
+ doProcessSequential(result, pairs);
}
if (result.get() != null) {
@@ -197,7 +197,7 @@
}
}
- protected void doProcessSequntial(AtomicExchange result,
Iterable<ProcessorExchangePair> pairs) throws Exception {
+ protected void doProcessSequential(AtomicExchange result,
Iterable<ProcessorExchangePair> pairs) throws Exception {
int total = 0;
for (ProcessorExchangePair pair : pairs) {
@@ -214,11 +214,11 @@
// should we stop in case of an exception occured during
processing?
if (stopOnException && subExchange.getException() != null) {
- throw new CamelExchangeException("Sequiental processing failed
for number " + total, subExchange, subExchange.getException());
+ throw new CamelExchangeException("Sequential processing failed
for number " + total, subExchange, subExchange.getException());
}
if (LOG.isTraceEnabled()) {
- LOG.trace("Sequiental processing complete for number " + total
+ " exchange: " + subExchange);
+ LOG.trace("Sequential processing complete for number " + total
+ " exchange: " + subExchange);
}
if (aggregationStrategy != null) {
@@ -228,7 +228,7 @@
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Done sequiental processing " + total + " exchanges");
+ LOG.debug("Done sequential processing " + total + " exchanges");
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
Tue Sep 8 13:47:57 2009
@@ -109,7 +109,7 @@
// must use a copy as we dont want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
- // must remove exception otherwise onFaulure routing will fail
as well
+ // must remove exception otherwise onFailure routing will fail
as well
// the caused exception is stored as a property
(Exchange.EXCEPTION_CAUGHT) on the exchange
copy.setException(null);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
Tue Sep 8 13:47:57 2009
@@ -33,6 +33,7 @@
import org.apache.camel.processor.resequencer.SequenceSender;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.concurrent.ExecutorServiceHelper;
/**
* A resequencer that re-orders a (continuous) stream of {...@link Exchange}s.
The
@@ -187,7 +188,7 @@
private Condition deliveryRequestCondition =
deliveryRequestLock.newCondition();
public Delivery() {
- super("Resequencer Delivery Thread");
+ super(ExecutorServiceHelper.getThreadName("Resequencer Delivery"));
}
@Override
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
Tue Sep 8 13:47:57 2009
@@ -37,7 +37,7 @@
this.exceptions = exceptions;
for (Class type : exceptions) {
if (!ObjectHelper.isAssignableFrom(Throwable.class, type)) {
- throw new IllegalArgumentException("Class is not an instance
of Trowable: " + type);
+ throw new IllegalArgumentException("Class is not an instance
of Throwable: " + type);
}
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
Tue Sep 8 13:47:57 2009
@@ -18,6 +18,8 @@
import java.util.Timer;
+import org.apache.camel.util.concurrent.ExecutorServiceHelper;
+
/**
* Resequences elements based on a given {...@link SequenceElementComparator}.
* This resequencer is designed for resequencing element streams. Stream-based
@@ -97,7 +99,7 @@
}
public void start() {
- timer = new Timer("Camel Stream Resequencer Timer", true);
+ timer = new Timer(ExecutorServiceHelper.getThreadName("Stream
Resequencer Timer"), true);
}
/**
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CharlesSplitAndTryCatchRollbackIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CharlesSplitAndTryCatchRollbackIssueTest.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CharlesSplitAndTryCatchRollbackIssueTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CharlesSplitAndTryCatchRollbackIssueTest.java
Tue Sep 8 13:47:57 2009
@@ -72,7 +72,7 @@
fail("Should thrown an exception");
} catch (CamelExecutionException e) {
CamelExchangeException ee =
assertIsInstanceOf(CamelExchangeException.class, e.getCause());
- assertEquals("Sequiental processing failed for number 2 on the
exchange: Exchange[Message: Kaboom]", ee.getMessage());
+ assertEquals("Sequential processing failed for number 2 on the
exchange: Exchange[Message: Kaboom]", ee.getMessage());
RollbackExchangeException re =
assertIsInstanceOf(RollbackExchangeException.class, ee.getCause());
assertEquals("Intended rollback on the exchange: Exchange[Message:
Kaboom]", re.getMessage());
}
@@ -94,7 +94,7 @@
fail("Should thrown an exception");
} catch (CamelExecutionException e) {
CamelExchangeException ee =
assertIsInstanceOf(CamelExchangeException.class, e.getCause());
- assertEquals("Sequiental processing failed for number 3 on the
exchange: Exchange[Message: Kaboom]", ee.getMessage());
+ assertEquals("Sequential processing failed for number 3 on the
exchange: Exchange[Message: Kaboom]", ee.getMessage());
RollbackExchangeException re =
assertIsInstanceOf(RollbackExchangeException.class, ee.getCause());
assertEquals("Intended rollback on the exchange: Exchange[Message:
Kaboom]", re.getMessage());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStopOnExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStopOnExceptionTest.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStopOnExceptionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStopOnExceptionTest.java
Tue Sep 8 13:47:57 2009
@@ -51,7 +51,7 @@
fail("Should thrown an exception");
} catch (CamelExecutionException e) {
CamelExchangeException cause =
assertIsInstanceOf(CamelExchangeException.class, e.getCause());
- assertEquals("Sequiental processing failed for number 1 on the
exchange: Exchange[Message: Kaboom]", cause.getMessage());
+ assertEquals("Sequential processing failed for number 1 on the
exchange: Exchange[Message: Kaboom]", cause.getMessage());
assertEquals("Forced", cause.getCause().getMessage());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStopOnExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStopOnExceptionTest.java?rev=812510&r1=812509&r2=812510&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStopOnExceptionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStopOnExceptionTest.java
Tue Sep 8 13:47:57 2009
@@ -48,7 +48,7 @@
fail("Should thrown an exception");
} catch (CamelExecutionException e) {
CamelExchangeException cause =
assertIsInstanceOf(CamelExchangeException.class, e.getCause());
- assertEquals("Sequiental processing failed for number 1 on the
exchange: Exchange[Message: Kaboom]", cause.getMessage());
+ assertEquals("Sequential processing failed for number 1 on the
exchange: Exchange[Message: Kaboom]", cause.getMessage());
assertEquals("Forced", cause.getCause().getMessage());
}
