andymc12 closed pull request #364: CXF-7604 Refine error message during error
handling
URL: https://github.com/apache/cxf/pull/364
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 629de73325e..670b73e156b 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 void onMessage(Message message) {
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 a0f7b15212a..487243982f2 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.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
