Merge pull request #4515 from GDLMadushanka/fixReflection

Fix correlation logs changing the task behaviour

Author: GDLMadushanka

components/org.wso2.micro.integrator.ndatasource.rdbms/src/main/java/org/wso2/micro/integrator/ndatasource/rdbms/CorrelationLogInterceptor.java

@@ -32,6 +32,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.interceptor.AbstractQueryReport;
+import org.wso2.micro.integrator.ndatasource.rdbms.utils.RDBMSDataSourceUtils;
 
 /**
  * Time-Logging interceptor for JDBC pool.
@@ -199,7 +200,13 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                 Object result = null;
 
                 if (this.delegate != null) {
-                    result = method.invoke(this.delegate, args);
+                    try {
+                        result = method.invoke(this.delegate, args);
+                    } catch (Throwable ex) {
+                        // Unwrap the exceptions related to reflection calls.
+                        ex = RDBMSDataSourceUtils.unwrap(ex);
+                        throw ex;
+                    }
                 }
 
                 //If the query is an execute type of query the time taken is calculated and logged

components/org.wso2.micro.integrator.ndatasource.rdbms/src/main/java/org/wso2/micro/integrator/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java

@@ -17,8 +17,10 @@
  */
 package org.wso2.micro.integrator.ndatasource.rdbms.utils;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.sql.Connection;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -374,5 +376,20 @@ private static void handleExternalDataSource(PoolProperties poolProps, RDBMSConf
 		            e.getMessage(), e);
 		}
 	}
+
+    /**
+     * Recursively unwraps common reflective wrapper exceptions to reveal the original cause.
+     * This method traverses through {@link InvocationTargetException} and
+     * {@link UndeclaredThrowableException} instances until the root cause is found.
+     *
+     * @param e the throwable to unwrap
+     * @return the root cause if {@code e} is wrapped, or {@code e} itself if not
+     */
+    public static Throwable unwrap(Throwable e) {
+        if (e instanceof InvocationTargetException || e instanceof UndeclaredThrowableException) {
+            return unwrap(e.getCause());
+        }
+        return e;
+    }
 
 }