From e1870493ee657652f1f798502da17b5455f72653 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 12 Dec 2007 12:00:41 +0000
Subject: [PATCH] Add special exception handling so that JConsole can get stack
 traces

---
 .../TypeConverterMethodInterceptor.java       | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java
index bdd79bd9a..edc059541 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java
@@ -16,6 +16,8 @@
 
 package org.springframework.batch.execution.bootstrap.support;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.Method;
 
 import org.aopalliance.intercept.MethodInterceptor;
@@ -37,6 +39,21 @@ public class TypeConverterMethodInterceptor implements MethodInterceptor {
 	// Get the default PropertyEditorRegistry free.
 	private TypeConverter typeConverter = new SimpleTypeConverter();
 
+	private boolean convertException = false;
+
+	/**
+	 * Set a flag that will cause exceptions during method invocation to be
+	 * caught and treated as a result. This can be useful if used over JConsole,
+	 * where exception reporting is a little weak (and in addition the class of
+	 * the exception might not be available remotely).
+	 * 
+	 * @param convertException
+	 *            the flag to set (default false)
+	 */
+	public void setConvertException(boolean convertException) {
+		this.convertException = convertException;
+	}
+
 	/**
 	 * Public setter for the {@link TypeConverter} property. Defaults to a
 	 * {@link SimpleTypeConverter}.
@@ -76,8 +93,18 @@ public class TypeConverterMethodInterceptor implements MethodInterceptor {
 		}
 
 		// Invoke the target method
-		Object result = ReflectionUtils.invokeMethod(method, invocation
-				.getThis(), invocation.getArguments());
+		Object result = null;
+
+		try {
+			result = ReflectionUtils.invokeMethod(method, invocation.getThis(),
+					invocation.getArguments());
+		} catch (Throwable e) {
+			if (convertException) {
+				result = e;
+			} else {
+				throw e;
+			}
+		}
 		if (result == null) {
 			return null;
 		}
@@ -91,7 +118,15 @@ public class TypeConverterMethodInterceptor implements MethodInterceptor {
 	}
 
 	private Object convert(Object result, Class returnType) {
+		// Provide some simple conversion algorithms natively for String results
 		if (returnType.isAssignableFrom(String.class)) {
+			if (result instanceof Throwable) {
+				Throwable e = (Throwable) result;
+				e.fillInStackTrace();
+				StringWriter writer = new StringWriter();
+				e.printStackTrace(new PrintWriter(writer));
+				result = writer.toString();
+			}
 			return result.toString();
 		}
 		return typeConverter.convertIfNecessary(result, returnType);