You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/06/30 10:28:14 UTC
svn commit: r959226 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/util/ExchangeHelper.java
test/java/org/apache/camel/impl/DefaultExchangeTest.java
Author: ningjiang
Date: Wed Jun 30 08:28:14 2010
New Revision: 959226
URL: http://svn.apache.org/viewvc?rev=959226&view=rev
Log:
Checked the camel context of Exchange and added more tests on DefaultExchange
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.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=959226&r1=959225&r2=959226&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 Wed Jun 30 08:28:14 2010
@@ -136,6 +136,7 @@ public final class ExchangeHelper {
*/
public static <T> T convertToMandatoryType(Exchange exchange, Class<T> type, Object value) throws NoTypeConversionAvailableException {
CamelContext camelContext = exchange.getContext();
+ ObjectHelper.notNull(camelContext, "CamelContext of Exchange");
TypeConverter converter = camelContext.getTypeConverter();
if (converter != null) {
return converter.mandatoryConvertTo(type, exchange, value);
@@ -149,6 +150,7 @@ public final class ExchangeHelper {
*/
public static <T> T convertToType(Exchange exchange, Class<T> type, Object value) {
CamelContext camelContext = exchange.getContext();
+ ObjectHelper.notNull(camelContext, "CamelContext of Exchange");
TypeConverter converter = camelContext.getTypeConverter();
if (converter != null) {
return converter.convertTo(type, exchange, value);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java?rev=959226&r1=959225&r2=959226&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java Wed Jun 30 08:28:14 2010
@@ -100,6 +100,11 @@ public class DefaultExchangeTest extends
assertEquals("apple", exchange.getProperty("fruit"));
assertEquals(null, exchange.getProperty("beer"));
assertEquals(null, exchange.getProperty("beer", String.class));
+
+ // Current TypeConverter support to turn the null value to false of boolean,
+ // as assertEquals needs the Object as the parameter, we have to use Boolean.FALSE value in this case
+ assertEquals(Boolean.FALSE, exchange.getProperty("beer", boolean.class));
+ assertEquals(null, exchange.getProperty("beer", Boolean.class));
assertEquals("apple", exchange.getProperty("fruit", String.class));
assertEquals("apple", exchange.getProperty("fruit", "banana", String.class));