More defensive arg checks for startup message

datastax · May 20, 2020 · 4c15fc5 · 4c15fc5
1 parent 2fc07ef
commit 4c15fc5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/datastax/mcac/interceptors/StartupMessageInterceptor.java b/src/main/java/com/datastax/mcac/interceptors/StartupMessageInterceptor.java
@@ -50,7 +50,8 @@ public static Object intercept(@This Object instance, @AllArguments Object[] all
 
         try
         {
-            if (allArguments.length > 0 && allArguments[0] != null && allArguments[0] instanceof QueryState)
+            if (allArguments.length > 1 && allArguments[0] != null && allArguments[0] instanceof QueryState &&
+               allArguments[1] instanceof StartupMessage)
             {
                 QueryState queryState = (QueryState) allArguments[0];
                 StartupMessage request = ((StartupMessage) instance);