You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/02/03 23:49:50 UTC

svn commit: r1656941 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd: classload/ProxyJobDriverUserError.java ux/

Author: degenaro
Date: Tue Feb  3 22:49:50 2015
New Revision: 1656941

URL: http://svn.apache.org/r1656941
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath

provide full stack trace in JD log when CR throws an exception

Removed:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/ux/
Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java?rev=1656941&r1=1656940&r2=1656941&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java Tue Feb  3 22:49:50 2015
@@ -18,6 +18,8 @@
 */
 package org.apache.uima.ducc.container.jd.classload;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.apache.uima.ducc.container.common.MessageBuffer;
 import org.apache.uima.ducc.container.common.Standardize;
 import org.apache.uima.ducc.container.common.logger.IComponent;
@@ -32,18 +34,23 @@ public class ProxyJobDriverUserError {
 	public static void loggifyUserException(Exception e) {
 		String location = "loggifyUserException";
 		if(e != null) {
-			if(e instanceof JdUserException) {
-				JdUserException jdUserException = (JdUserException) e;
-				String userException = jdUserException.getUserException();
-				if(userException != null) {
-					logger.error(location, ILogger.null_id, userException);
+			if(e instanceof InvocationTargetException) {
+				InvocationTargetException ite = (InvocationTargetException) e;
+				Throwable t = ite.getTargetException();
+				if(e instanceof JdUserException) {
+					JdUserException jdUserException = (JdUserException) t;
+					loggifyJdUserException(jdUserException);
 				}
 				else {
 					MessageBuffer mb = new MessageBuffer();
-					mb.append(Standardize.Label.instance.get()+null);
+					mb.append(Standardize.Label.classname.get()+e.getClass().getName());
 					logger.debug(location, ILogger.null_id, mb);
 				}
 			}
+			else if(e instanceof JdUserException) {
+				JdUserException jdUserException = (JdUserException) e;
+				loggifyJdUserException(jdUserException);
+			}
 			else {
 				MessageBuffer mb = new MessageBuffer();
 				mb.append(Standardize.Label.classname.get()+e.getClass().getName());
@@ -56,4 +63,17 @@ public class ProxyJobDriverUserError {
 			logger.debug(location, ILogger.null_id, mb);
 		}
 	}
+	
+	private static void loggifyJdUserException(JdUserException jdUserException) {
+		String location = "loggifyJdUserException";
+		String userException = jdUserException.getUserException();
+		if(userException != null) {
+			logger.error(location, ILogger.null_id, userException);
+		}
+		else {
+			MessageBuffer mb = new MessageBuffer();
+			mb.append(Standardize.Label.instance.get()+null);
+			logger.debug(location, ILogger.null_id, mb);
+		}
+	}
 }