Author: dkulp
Date: Wed Apr 23 14:18:52 2008
New Revision: 651066
URL: http://svn.apache.org/viewvc?rev=651066&view=rev
Log:
Merged revisions 650642 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r650642 | dkulp | 2008-04-22 16:37:23 -0400 (Tue, 22 Apr 2008) | 2 lines
Update the exception log to include the classnames.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=651066&r1=651065&r2=651066&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Wed Apr 23 14:18:52 2008
@@ -31,6 +31,7 @@
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.message.FaultMode;
@@ -223,16 +224,23 @@
if (!faultOccurred) {
faultOccurred = true;
-
+
FaultMode mode = message.get(FaultMode.class);
if (mode == FaultMode.CHECKED_APPLICATION_FAULT) {
if (LOG.isLoggable(Level.FINE)) {
LogUtils.log(LOG, Level.FINE,
"Application has thrown exception,
unwinding now", ex);
} else if (LOG.isLoggable(Level.INFO)) {
+ Throwable t = ex;
+ if (ex instanceof Fault
+ && ex.getCause() != null) {
+ t = ex.getCause();
+ }
+
LogUtils.log(LOG, Level.INFO,
- "Application has thrown exception,
unwinding now: "
- + ex.getMessage());
+ "Application has thrown exception,
unwinding now: "
+ + t.getClass().getName()
+ + ": " + ex.getMessage());
}
} else if (LOG.isLoggable(Level.INFO)) {
if (mode == FaultMode.UNCHECKED_APPLICATION_FAULT) {
