root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

HttpInvokerClientInterceptor propagates client-side Error as-is 

Issue: SPR-14985
(cherry picked from commit ee30ce9)
This commit is contained in:
Juergen Hoeller 2016-12-08 18:29:41 +01:00
parent ced7503d95
commit c6663f59b8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
View File

@ -140,12 +140,15 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
RemoteInvocation invocation = createRemoteInvocation(methodInvocation); RemoteInvocation invocation = createRemoteInvocation(methodInvocation);
RemoteInvocationResult result; RemoteInvocationResult result;
try { try {
result = executeRequest(invocation, methodInvocation); result = executeRequest(invocation, methodInvocation);
} }
catch (Throwable ex) { catch (Throwable ex) {
throw convertHttpInvokerAccessException(ex); RemoteAccessException rae = convertHttpInvokerAccessException(ex);
throw (rae != null ? rae : ex);
} }
try { try {
return recreateRemoteInvocationResult(result); return recreateRemoteInvocationResult(result);
} }
@ -161,7 +164,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
} }
/** /**
* Execute the given remote invocation via the HttpInvokerRequestExecutor. * Execute the given remote invocation via the {@link HttpInvokerRequestExecutor}.
* <p>This implementation delegates to {@link #executeRequest(RemoteInvocation)}. * <p>This implementation delegates to {@link #executeRequest(RemoteInvocation)}.
* Can be overridden to react to the specific original MethodInvocation. * Can be overridden to react to the specific original MethodInvocation.
* @param invocation the RemoteInvocation to execute * @param invocation the RemoteInvocation to execute
@ -177,7 +180,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
} }
/** /**
* Execute the given remote invocation via the HttpInvokerRequestExecutor. * Execute the given remote invocation via the {@link HttpInvokerRequestExecutor}.
* <p>Can be overridden in subclasses to pass a different configuration object * <p>Can be overridden in subclasses to pass a different configuration object
* to the executor. Alternatively, add further configuration properties in a * to the executor. Alternatively, add further configuration properties in a
* subclass of this accessor: By default, the accessor passed itself as * subclass of this accessor: By default, the accessor passed itself as
@ -196,9 +199,10 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
/** /**
* Convert the given HTTP invoker access exception to an appropriate * Convert the given HTTP invoker access exception to an appropriate
* Spring RemoteAccessException. * Spring {@link RemoteAccessException}.
* @param ex the exception to convert * @param ex the exception to convert
* @return the RemoteAccessException to throw * @return the RemoteAccessException to throw, or {@code null} to have the
* original exception propagated to the caller
*/ */
protected RemoteAccessException convertHttpInvokerAccessException(Throwable ex) { protected RemoteAccessException convertHttpInvokerAccessException(Throwable ex) {
if (ex instanceof ConnectException) { if (ex instanceof ConnectException) {
@ -212,8 +216,13 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
"Could not deserialize result from HTTP invoker remote service [" + getServiceUrl() + "]", ex); "Could not deserialize result from HTTP invoker remote service [" + getServiceUrl() + "]", ex);
} }
if (ex instanceof Exception) {
return new RemoteAccessException( return new RemoteAccessException(
"Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex); "Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
} }
// For any other Throwable, e.g. OutOfMemoryError: let it get propagated as-is.
return null;
}
} }