svn commit: r692006 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/builder/ main/java/org/apache/camel/converter/ test/java/org/apache/camel/builder/

[ningjiang]

Author: ningjiang
Date: Thu Sep  4 06:31:52 2008
New Revision: 692006

URL: http://svn.apache.org/viewvc?rev=692006&view=rev
Log:
CAMEL-400 getting the property with the type class paremeter

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=692006&r1=692005&r2=692006&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
 Thu Sep  4 06:31:52 2008
@@ -458,7 +458,7 @@
     }
 
     private static Scanner getScanner(Expression expression, Exchange 
exchange, Object value) {
-        String charset = (String)exchange.getProperty(Exchange.CHARSET_NAME);
+        String charset = exchange.getProperty(Exchange.CHARSET_NAME, 
String.class);
 
         Scanner scanner = null;
         if (value instanceof Readable) {

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=692006&r1=692005&r2=692006&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
 Thu Sep  4 06:31:52 2008
@@ -140,7 +140,7 @@
     @Converter
     public static String toString(byte[] data, Exchange exchange) {
         if (exchange != null) {
-            String charsetName = (String) 
exchange.getProperty(Exchange.CHARSET_NAME);
+            String charsetName = exchange.getProperty(Exchange.CHARSET_NAME, 
String.class);
             if (charsetName != null) {
                 try {
                     return new String(data, charsetName);

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java?rev=692006&r1=692005&r2=692006&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
 Thu Sep  4 06:31:52 2008
@@ -91,7 +91,7 @@
         ByteBuffer buf = ByteBuffer.allocate(value.length());
         byte[] bytes = null;
         if (exchange != null) {
-            String charsetName = 
(String)exchange.getProperty(Exchange.CHARSET_NAME);
+            String charsetName = exchange.getProperty(Exchange.CHARSET_NAME, 
String.class);
             if (charsetName != null) {
                 try {
                     bytes = value.getBytes(charsetName);

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java?rev=692006&r1=692005&r2=692006&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
 Thu Sep  4 06:31:52 2008
@@ -24,6 +24,9 @@
 import org.apache.camel.Message;
 import org.apache.camel.Predicate;
 import org.apache.camel.TestSupport;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.DefaultExchange;
+
 import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
 import static org.apache.camel.builder.ExpressionBuilder.constantExpression;
 import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
@@ -31,8 +34,6 @@
 import static org.apache.camel.builder.ExpressionBuilder.regexTokenize;
 import static org.apache.camel.builder.ExpressionBuilder.tokenizeExpression;
 import static org.apache.camel.builder.PredicateBuilder.contains;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.DefaultExchange;
 
 /**
  * @version $Revision$