Null check in findSuperClassParameterType

BimberLab · Mar 1, 2024 · 9594aef · 9594aef
1 parent 12bdb58
commit 9594aef
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequencePipelineServiceImpl.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequencePipelineServiceImpl.java
@@ -126,15 +126,21 @@ public Class<?> findSuperClassParameterType(Object instance)
     }
 
     // Based on: https://www.javacodegeeks.com/2013/12/advanced-java-generics-retreiving-generic-type-arguments.html
-    public static Class<?> findSuperClassParameterType(Object instance, int parameterIndex) {
+    public static Class<?> findSuperClassParameterType(Object instance, int parameterIndex)
+    {
         Class<?> clazz = instance.getClass();
-        while (clazz != clazz.getSuperclass()) {
+        if (clazz == null)
+        {
+            throw new IllegalStateException("Class was null for instance: " + instance);
+        }
+
+        while (clazz != null && clazz != clazz.getSuperclass())
+        {
             if (clazz.getGenericSuperclass() instanceof ParameterizedType pt)
             {
                 return (Class<?>) pt.getActualTypeArguments()[parameterIndex];
             }
 
-
             clazz = clazz.getSuperclass();
         }