You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by am...@apache.org on 2018/01/08 20:37:48 UTC

[cxf] branch 3.1.x-fixes updated: CXF-7604 Refine error message during error handling

This is an automated email from the ASF dual-hosted git repository.

amccright pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 9903393  CXF-7604 Refine error message during error handling
9903393 is described below

commit 99033931b6f2568d0d8ce0df0afcbae1dba49efe
Author: Andy McCright <j....@gmail.com>
AuthorDate: Fri Jan 5 16:10:24 2018 -0600

    CXF-7604 Refine error message during error handling
    
    Use Messages.properties and change message to better indicate that an
    error occurred during error handling, preventing further action.
---
 .../apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java   | 4 ++--
 core/src/main/java/org/apache/cxf/interceptor/Messages.properties     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
index 93230e8..06607b4 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
@@ -111,10 +111,10 @@ public abstract class AbstractFaultChainInitiatorObserver implements MessageObse
             try {
                 chain.doIntercept(faultMessage);
             } catch (RuntimeException exc) {
-                LOG.log(Level.SEVERE, "Error occurred during error handling, give up!", exc);
+                LOG.log(Level.SEVERE, "ERROR_DURING_ERROR_PROCESSING", exc);
                 throw exc;
             } catch (Exception exc) {
-                LOG.log(Level.SEVERE, "Error occurred during error handling, give up!", exc);
+                LOG.log(Level.SEVERE, "ERROR_DURING_ERROR_PROCESSING", exc);
                 throw new RuntimeException(exc);
             }
         } finally {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/Messages.properties b/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
index a0f7b15..4872439 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
+++ b/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
@@ -42,4 +42,5 @@ EXCEPTION_WHILE_WRITING_FAULT = Exception occurred while writing fault.
 EXCEPTION_WHILE_CREATING_EXCEPTION = Exception occurred while creating exception: {0}
 UNEXPECTED_WRAPPER_ELEMENT = Unexpected wrapper element {0} found.   Expected {1}.
 UNEXPECTED_ELEMENT = Unexpected element {0} found.   Expected {1}.
+ERROR_DURING_ERROR_PROCESSING=An unexpected error occurred during error handling. No further error processing will occur.
  

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].