GH-1258: Change OOMHandler to JavaLangErrorHandler

Resolves #1258

Call the handler for all `Error`s on container threads.

**I will do the cherry-pick; there will be conflicts**

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java

@@ -244,7 +244,7 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor
 
 	private boolean isBatchListener;
 
-	private OOMHandler oOMHandler = error -> System.exit(99);
+	private JavaLangErrorHandler javaLangErrorHandler = error -> { };
 
 	private volatile boolean lazyLoad;
 
@@ -1125,19 +1125,19 @@ public void setMicrometerEnabled(boolean micrometerEnabled) {
 		this.micrometerEnabled = micrometerEnabled;
 	}
 
-	protected OOMHandler getOOMHandler() {
-		return this.oOMHandler;
+	protected JavaLangErrorHandler getJavaLangErrorHandler() {
+		return this.javaLangErrorHandler;
 	}
 
 	/**
-	 * Provide an OOMHandler implementation; by default, {@code System.exit(99)} is
-	 * called.
-	 * @param oOMHandler the handler.
+	 * Provide a JavaLangErrorHandler implementation; by default no action is taken,
+	 * for backwards compatibility; generally the JVM should be terminated.
+	 * @param javaLangErrorHandler the handler.
 	 * @since 2.2.12
 	 */
-	public void setOOMHandler(OOMHandler oOMHandler) {
-		Assert.notNull(oOMHandler, "'oOMHandler' cannot be null");
-		this.oOMHandler = oOMHandler;
+	public void setjavaLangErrorHandler(JavaLangErrorHandler javaLangErrorHandler) {
+		Assert.notNull(javaLangErrorHandler, "'javaLangErrorHandler' cannot be null");
+		this.javaLangErrorHandler = javaLangErrorHandler;
 	}
 
 	/**
@@ -1968,18 +1968,18 @@ private interface ContainerDelegate {
 	}
 
 	/**
-	 * A handler for {@link OutOfMemoryError} on the container thread(s).
+	 * A handler for {@link Error} on the container thread(s).
 	 * @since 2.2.12
 	 *
 	 */
 	@FunctionalInterface
-	public interface OOMHandler {
+	public interface JavaLangErrorHandler {
 
 		/**
 		 * Handle the error; typically, the JVM will be terminated.
 		 * @param error the error.
 		 */
-		void handle(OutOfMemoryError error);
+		void handle(Error error);
 
 	}
 

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/DirectMessageListenerContainer.java

@@ -1085,8 +1085,8 @@ private void callExecuteListener(Object data, long deliveryTag) {
 					}
 				}
 			}
-			catch (OutOfMemoryError e) { // NOSONAR
-				getOOMHandler().handle(e);
+			catch (Error e) { // NOSONAR
+				getJavaLangErrorHandler().handle(e);
 				throw e;
 			}
 		}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java

@@ -1264,12 +1264,9 @@ public void run() { // NOSONAR - line count
 				}
 			}
 			catch (Error e) { //NOSONAR
-				// ok to catch Error - we're aborting so will stop
 				logger.error("Consumer thread error, thread abort.", e);
-				if (e instanceof OutOfMemoryError) { // NOSONAR
-					getOOMHandler().handle((OutOfMemoryError) e);
-				}
 				publishConsumerFailedEvent("Consumer threw an Error", true, e);
+				getJavaLangErrorHandler().handle(e);
 				aborted = true;
 			}
 			catch (Throwable t) { //NOSONAR

src/reference/asciidoc/amqp.adoc

@@ -5430,10 +5430,10 @@ Default is a `SimpleAsyncTaskExecutor`, using internally managed threads.
 a| image::images/tickmark.png[]
 a| image::images/tickmark.png[]
 
-| oOMHandler
+| javaLangErrorHandler
 (N/A)
 
-| An `AbstractMessageListenerContainer.OOMHandler` implementation that is called when a container thread catches an `OutOfMemoryException`.
+| An `AbstractMessageListenerContainer.JavaLangErrorHandler` implementation that is called when a container thread catches an `Error`.
 The default implementation does nothing, for backwards compatibility.
 Normally, the JVM should be terminated; this will be the default action in a future release.
 

src/reference/asciidoc/whats-new.adoc

@@ -35,7 +35,7 @@ See <<exception-handling>> for more information.
 Listener performance can now be monitored using Micrometer `Timer` s.
 See <<micrometer>> for more information.
 
-You can now configure an `OOMHandler` (out of memory handler); the default implementation does nothing, for backwards compatibility.
+You can now configure an `JavaLangErrorHandler`; the default implementation does nothing, for backwards compatibility.
 Normally, the JVM should be terminated; this will be the default action in a future release.
 See <<containerAttributes>> for more information.