This is an automated email from the ASF dual-hosted git repository. sergeyb pushed a commit to branch revert-345-master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3a22d3e31b1e62d3256c4b1aefe7e24e8a429487 Author: sberyozkin <[email protected]> AuthorDate: Mon Nov 27 12:22:53 2017 +0000 Revert "When failing to close conduit, distinct read faults from write faults" --- .../main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java | 3 --- core/src/main/java/org/apache/cxf/interceptor/Messages.properties | 1 - 2 files changed, 4 deletions(-) diff --git a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java index 211a218..8288a70 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java @@ -20,7 +20,6 @@ package org.apache.cxf.interceptor; import java.io.IOException; -import java.net.SocketTimeoutException; import java.util.ResourceBundle; import org.apache.cxf.common.i18n.BundleUtils; @@ -61,8 +60,6 @@ public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message> public void handleMessage(Message message) throws Fault { try { getConduit(message).close(message); - } catch (SocketTimeoutException e) { - throw new Fault(new org.apache.cxf.common.i18n.Message("COULD_NOT_RECEIVE", BUNDLE), e); } catch (IOException e) { throw new Fault(new org.apache.cxf.common.i18n.Message("COULD_NOT_SEND", BUNDLE), e); } 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..0b32fee 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/Messages.properties +++ b/core/src/main/java/org/apache/cxf/interceptor/Messages.properties @@ -29,7 +29,6 @@ NO_DATAREADER=No DataReader is available for Service: {0} NO_DATAWRITER=No DataWriter is available for Service: {0} COULD_NOT_UNRWAP=Could not unwrap message parts. COULD_NOT_SEND=Could not send Message. -COULD_NOT_RECEIVE=Could not receive Message. NO_PART_FOUND=Message part {0} was not recognized. (Does it exist in service WSDL?) ORDERED_PARAM_REQUIRED=Parameter should be ordered in the following sequence: {0} WRITE_ATTACHMENTS=Could not write attachments. -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
