Author: shawkins Date: 2009-05-18 14:41:34 -0400 (Mon, 18 May 2009) New Revision: 976 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java Log: TEIID-602 checks to prevent child exceptions from reporting their cause as themselves (which shouldn't be happening, but may be coming from an inappropriate override by a third-party). this doesn't prevent more exotic recursive scenarios, but those typically don't happen. Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2009-05-18 18:34:21 UTC (rev 975) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2009-05-18 18:41:34 UTC (rev 976) @@ -232,7 +232,7 @@ if(e instanceof MetaMatrixProcessingException) { Throwable cause = e; while (cause.getCause() != null && cause.getCause() != cause) { - cause = e.getCause(); + cause = cause.getCause(); } StackTraceElement elem = cause.getStackTrace()[0]; LogManager.logWarning(LogConstants.CTX_DQP, DQPPlugin.Util.getString("ProcessWorker.processing_error", e.getMessage(), requestID, e.getClass().getName(), elem)); //$NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java 2009-05-18 18:34:21 UTC (rev 975) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java 2009-05-18 18:41:34 UTC (rev 976) @@ -170,7 +170,7 @@ private void logProcessingException(Throwable e, String context) { Throwable cause = e; while (cause.getCause() != null && cause != cause.getCause()) { - cause = e.getCause(); + cause = cause.getCause(); } StackTraceElement elem = cause.getStackTrace()[0]; LogManager.logDetail(context, e, "Processing exception for session", this.socketClientInstance.getWorkContext().getConnectionID()); //$NON-NLS-1$