svn commit: r704061 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: component/bean/BeanProcessor.java component/bean/MethodInfo.java component/bean/MethodInvocation.java util/IntrospectionSupport.java

[davsclaus]

Author: davsclaus
Date: Mon Oct 13 05:19:09 2008
New Revision: 704061

URL: http://svn.apache.org/viewvc?rev=704061&view=rev
Log:
CAMEL-981. BeanProcessor clean in try .. catch.

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=704061&r1=704060&r2=704061&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
 Mon Oct 13 05:19:09 2008
@@ -133,17 +133,14 @@
             }
         } catch (InvocationTargetException e) {
             // lets unwrap the exception
-            Throwable cause = e.getCause();
-            if (cause instanceof Exception) {
-                throw (Exception) cause;
+            Throwable throwable = e.getCause();
+            if (throwable instanceof Exception) {
+                Exception exception = (Exception)throwable;
+                throw exception;
             } else {
-                // do not handle errors!
-                throw e;
+                Error error = (Error)throwable;
+                throw error;
             }
-        } catch (Exception e) {
-            throw e;
-        } catch (Throwable throwable) {
-            throw new Exception(throwable);
         } finally {
             if (isExplicitMethod) {
                 in.setHeader(METHOD_NAME, prevMethod);

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=704061&r1=704060&r2=704061&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
 Mon Oct 13 05:19:09 2008
@@ -85,7 +85,7 @@
                 return arguments;
             }
 
-            public Object proceed() throws Throwable {
+            public Object proceed() throws Exception {
                 if (LOG.isTraceEnabled()) {
                     LOG.trace(">>>> invoking: " + method + " on bean: " + pojo 
+ " with arguments: " + asString(arguments) + " for exchange: " + exchange);
                 }

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java?rev=704061&r1=704060&r2=704061&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
 Mon Oct 13 05:19:09 2008
@@ -30,7 +30,7 @@
 
     Object[] getArguments();
 
-    Object proceed() throws Throwable;
+    Object proceed() throws Exception;
 
     Object getThis();
 

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=704061&r1=704060&r2=704061&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
 Mon Oct 13 05:19:09 2008
@@ -221,7 +221,8 @@
                 return false;
             }
         } catch (InvocationTargetException e) {
-            Throwable throwable = e.getTargetException();
+            // lets unwrap the exception
+            Throwable throwable = e.getCause();
             if (throwable instanceof Exception) {
                 Exception exception = (Exception)throwable;
                 throw exception;