camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1201751 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java
Date Mon, 14 Nov 2011 15:35:07 GMT
Author: dkulp
Date: Mon Nov 14 15:35:06 2011
New Revision: 1201751

URL: http://svn.apache.org/viewvc?rev=1201751&view=rev
Log:
Merged revisions 1183271 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1183271 | ningjiang | 2011-10-14 05:58:00 -0400 (Fri, 14 Oct 2011) | 1 line
  
  CAMEL-4542 Fix the issue of using VM and splitter bean
........

Added:
    camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java
      - copied unchanged from r1183271, camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java

Propchange: camel/branches/camel-2.8.x/
            ('svn:mergeinfo' removed)

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=1201751&r1=1201750&r2=1201751&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
(original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
Mon Nov 14 15:35:06 2011
@@ -170,7 +170,7 @@ public class MethodCallExpression extend
             BeanHolder holder = new RegistryBean(camelContext, ref);
             // get the bean which will check that it exists
             instance = holder.getBean();
-            answer = new BeanExpression(ref, getMethod());
+            answer = new BeanExpression(instance, getMethod());
         }
 
         validateHasMethod(camelContext, instance, beanType, getMethod());



Mime
View raw message