You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/06/09 13:12:22 UTC

svn commit: r782956 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: component/bean/MethodInfo.java util/MessageHelper.java

Author: davsclaus
Date: Tue Jun  9 11:12:22 2009
New Revision: 782956

URL: http://svn.apache.org/viewvc?rev=782956&view=rev
Log:
Fixed stack overflow reported by TC

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=782956&r1=782955&r2=782956&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Tue Jun  9 11:12:22 2009
@@ -174,6 +174,7 @@
     }
 
     protected Expression createParametersExpression() {
+        // TODO: better check for size / parameters do not match up -> NPE
         final int size = parameters.size();
         final Expression[] expressions = new Expression[size];
         for (int i = 0; i < size; i++) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=782956&r1=782955&r2=782956&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java Tue Jun  9 11:12:22 2009
@@ -129,7 +129,12 @@
             length = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, property);
         }
 
-        String body = extractBodyAsString(message);
+        Object obj = message.getBody();
+        if (obj == null) {
+            return "Message: [Body is null]";
+        }
+
+        String body = obj.toString();
         if (body == null) {
             return "Message: [Body is null]";
         }