Author: dkulp Date: Wed Oct 26 16:16:59 2011 New Revision: 1189289 URL: http://svn.apache.org/viewvc?rev=1189289&view=rev Log: Merged revisions 1188936 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1188936 | dkulp | 2011-10-25 17:47:31 -0400 (Tue, 25 Oct 2011) | 9 lines Merged revisions 1188933 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1188933 | dkulp | 2011-10-25 17:37:13 -0400 (Tue, 25 Oct 2011) | 1 line [CXF-3878] Honor the return value on the fault listener ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java?rev=1189289&r1=1189288&r2=1189289&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java Wed Oct 26 16:16:59 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); }
