Reflectively check exception handler field to avoid breaking disrupto…

…r 3.3.0 Co-authored-by: ags <[email protected]> Co-authored-by: Daniel Milnes <[email protected]> Co-authored-by: DJ <[email protected]>
LMAX-Exchange · Oct 16, 2024 · 6f892aa · 6f892aa
1 parent 8e768b6
commit 6f892aa
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/main/java/com/lmax/tool/disruptor/ConfigurableValidator.java b/src/main/java/com/lmax/tool/disruptor/ConfigurableValidator.java
@@ -16,7 +16,6 @@
 package com.lmax.tool.disruptor;
 
 import com.lmax.disruptor.dsl.Disruptor;
-import com.lmax.disruptor.dsl.ExceptionHandlerWrapper;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -72,18 +71,23 @@ private void ensureDisruptorInstanceHasAnExceptionHandler(final Disruptor<?> dis
         {
             final Field field = Disruptor.class.getDeclaredField("exceptionHandler");
             field.setAccessible(true);
-            Object exceptionHandler = field.get(disruptor);
-            if (exceptionHandler instanceof ExceptionHandlerWrapper)
-            {
-                final Field delegateField = ExceptionHandlerWrapper.class.getDeclaredField("delegate");
-                delegateField.setAccessible(true);
-                exceptionHandler = delegateField.get(exceptionHandler);
-            }
+            final Object exceptionHandler = field.get(disruptor);
             if (exceptionHandler == null)
             {
                 throw new IllegalStateException("Please supply an ExceptionHandler to the Disruptor instance. " +
                         "The default Disruptor behaviour is to stop processing when an exception occurs.");
             }
+            if (exceptionHandler.getClass().getSimpleName().equals("com.lmax.disruptor.dsl.ExceptionHandlerWrapper"))
+            {
+                final Field delegateField = exceptionHandler.getClass().getDeclaredField("delegate");
+                delegateField.setAccessible(true);
+                final Object nestedExceptionHandler = delegateField.get(exceptionHandler);
+                if (nestedExceptionHandler == null)
+                {
+                    throw new IllegalStateException("Please supply an ExceptionHandler to the Disruptor instance. " +
+                            "The default Disruptor behaviour is to stop processing when an exception occurs.");
+                }
+            }
         }
         catch (NoSuchFieldException | IllegalAccessException e)
         {