[cxf] branch master updated: When failing to close conduit distinct read faults from write faults, patch from Joel Shemtov applied, This closes #345

[se...@apache.org]

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

sergeyb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 115cfcf  When failing to close conduit distinct read faults from write faults, patch from Joel Shemtov applied, This closes #345
115cfcf is described below

commit 115cfcfe582aa1a58d065d0171e678db12dc55f3
Author: Sergey Beryozkin <sb...@gmail.com>
AuthorDate: Mon Nov 27 12:50:17 2017 +0000

    When failing to close conduit distinct read faults from write faults, patch from Joel Shemtov applied, This closes #345
---
 .../java/org/apache/cxf/interceptor/MessageSenderInterceptor.java    | 5 ++++-
 core/src/main/java/org/apache/cxf/interceptor/Messages.properties    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

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 8288a70..ed55a17 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
@@ -20,6 +20,7 @@
 package org.apache.cxf.interceptor;
 
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 import java.util.ResourceBundle;
 
 import org.apache.cxf.common.i18n.BundleUtils;
@@ -60,6 +61,8 @@ 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);
             }
@@ -77,4 +80,4 @@ public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message>
         return conduit;
     }
 
-}
\ No newline at end of file
+}
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 0b32fee..a0f7b15 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
+++ b/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
@@ -29,6 +29,7 @@ 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
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].