Author: ningjiang Date: Thu Jul 12 16:05:10 2012 New Revision: 1360741 URL: http://svn.apache.org/viewvc?rev=1360741&view=rev Log: Merged revisions 1360727 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1360727 | ningjiang | 2012-07-12 23:27:24 +0800 (Thu, 12 Jul 2012) | 9 lines Merged revisions 1360719 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1360719 | ningjiang | 2012-07-12 23:18:24 +0800 (Thu, 12 Jul 2012) | 1 line CAMEL-4014 remove the System.out.println from SubResourceClassInvocationHandler ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1360719 Merged /camel/branches/camel-2.10.x:r1360727 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java?rev=1360741&r1=1360740&r2=1360741&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java Thu Jul 12 16:05:10 2012 @@ -29,7 +29,6 @@ public class SubResourceClassInvocationH public Object invoke(Object proxy, Method method, Object[] parameters) throws Throwable { Object result = null; Class<?> returnType = method.getReturnType(); - System.out.println("returnType class " + returnType); if (!returnType.isAssignableFrom(Void.class)) { // create a instance to return if (returnType.isInterface()) {