You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/25 23:37:13 UTC

svn commit: r1188933 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java

Author: dkulp
Date: Tue Oct 25 21:37:13 2011
New Revision: 1188933

URL: http://svn.apache.org/viewvc?rev=1188933&view=rev
Log:
[CXF-3878] Honor the return value on the fault listener

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java?rev=1188933&r1=1188932&r2=1188933&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java Tue Oct 25 21:37:13 2011
@@ -69,9 +69,11 @@ public class WebApplicationExceptionMapp
             flogger = (FaultListener)PhaseInterceptorChain.getCurrentMessage()
                 .getContextualProperty(FaultListener.class.getName());
         }
+        boolean doDefault = true;
         if (flogger != null) {
-            flogger.faultOccurred(ex, message, msg);
-        } else if (LOG.isLoggable(Level.FINE)) {
+            doDefault = flogger.faultOccurred(ex, message, msg);
+        }
+        if (LOG.isLoggable(Level.FINE) && doDefault) {
             LOG.log(Level.FINE, message, ex);
         }