Author: davsclaus
Date: Tue Oct 26 08:17:01 2010
New Revision: 1027397
URL: http://svn.apache.org/viewvc?rev=1027397&view=rev
Log:
CAMEL-3270: Upgraded to pax exam 1.2.2
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/parent/pom.xml
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=1027397&r1=1027396&r2=1027397&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
Tue Oct 26 08:17:01 2010
@@ -208,7 +208,7 @@ public final class ExchangeHelper {
// have created any OUT; such as a mock:endpoint
// so lets assume the last IN is the OUT
if (result.getPattern().isOutCapable()) {
- // only set OUT if its OUT capable or already has OUT
+ // only set OUT if its OUT capable
result.getOut().copyFrom(source.getIn());
} else {
// if not replace IN instead to keep the MEP
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1027397&r1=1027396&r2=1027397&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Oct 26 08:17:01 2010
@@ -109,7 +109,7 @@
<ognl-version>2.7.3_3</ognl-version>
<openjpa-version>1.2.2</openjpa-version>
<osgi-version>4.1.0</osgi-version>
- <pax-exam-version>1.2.1</pax-exam-version>
+ <pax-exam-version>1.2.2</pax-exam-version>
<pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
<protobuf-version>2.3.0</protobuf-version>
<qpid-version>0.5.0</qpid-version>
