HttpInvokerClientInterceptor propagates client-side Error as-is

Issue: SPR-14985

Author: jhoeller

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

@@ -140,12 +140,15 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 
 		RemoteInvocation invocation = createRemoteInvocation(methodInvocation);
 		RemoteInvocationResult result;
+
 		try {
 			result = executeRequest(invocation, methodInvocation);
 		}
 		catch (Throwable ex) {
-			throw convertHttpInvokerAccessException(ex);
+			RemoteAccessException rae = convertHttpInvokerAccessException(ex);
+			throw (rae != null ? rae : ex);
 		}
+
 		try {
 			return recreateRemoteInvocationResult(result);
 		}
@@ -161,7 +164,7 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 	}
 
 	/**
-	 * 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)}.
 	 * Can be overridden to react to the specific original MethodInvocation.
 	 * @param invocation the RemoteInvocation to execute
@@ -177,7 +180,7 @@ protected RemoteInvocationResult executeRequest(
 	}
 
 	/**
-	 * 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
 	 * to the executor. Alternatively, add further configuration properties in a
 	 * subclass of this accessor: By default, the accessor passed itself as
@@ -196,9 +199,10 @@ protected RemoteInvocationResult executeRequest(RemoteInvocation invocation) thr
 
 	/**
 	 * Convert the given HTTP invoker access exception to an appropriate
-	 * Spring RemoteAccessException.
+	 * Spring {@link RemoteAccessException}.
 	 * @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) {
 		if (ex instanceof ConnectException) {
@@ -212,8 +216,13 @@ protected RemoteAccessException convertHttpInvokerAccessException(Throwable ex)
 					"Could not deserialize result from HTTP invoker remote service [" + getServiceUrl() + "]", ex);
 		}
 
-		return new RemoteAccessException(
+		if (ex instanceof Exception) {
+			return new RemoteAccessException(
 					"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;
 	}
 
 }