[activemq] branch activemq-5.15.x updated: AMQ-7069 HTTP client don't handle XStream deserialization exception

[jbonofre]

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

jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new b1ba575  AMQ-7069 HTTP client don't handle XStream deserialization 
exception
b1ba575 is described below

commit b1ba57503744edf407d287b0fc81689283d54edc
Author: amarkevich <amarkev...@talend.com>
AuthorDate: Wed Oct 10 16:57:49 2018 +0300

    AMQ-7069 HTTP client don't handle XStream deserialization exception
    
    (cherry picked from commit b830894e690d317ba32019c00d7d4db01eadcc5d)
---
 .../java/org/apache/activemq/transport/http/HttpClientTransport.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
 
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
index 6582bb8..f64f7a0 100644
--- 
a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
+++ 
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
@@ -201,7 +201,7 @@ public class HttpClientTransport extends 
HttpTransportSupport {
                     }
                     stream.close();
                 }
-            } catch (IOException e) {
+            } catch (Exception e) { // handle RuntimeException from unmarshal
                 onException(IOExceptionSupport.create("Failed to perform GET 
on: " + remoteUrl + " Reason: " + e.getMessage(), e));
                 break;
             } finally {