Simplify condition and narrow checkstyle exception.

(cherry picked from commit f655975)
oracle · Aug 8, 2019 · a9233dc · a9233dc
1 parent 8a9fb51
commit a9233dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java b/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java
@@ -364,10 +364,7 @@ private static void set(Object array, int index, Object value) {
                 return;
             }
         } else if (array instanceof Object[]) {
-            if (value == null) {
-                ((Object[]) array)[index] = null;
-                return;
-            } else if (array.getClass().getComponentType().isAssignableFrom(value.getClass())) {
+            if (value == null || array.getClass().getComponentType().isAssignableFrom(value.getClass())) {
                 ((Object[]) array)[index] = value;
                 return;
             }

diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/ArraySetTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/ArraySetTest.java
@@ -24,7 +24,8 @@
  */
 package com.oracle.svm.test;
 
-// Checkstyle: off
+// Checkstyle: allow reflection
+
 import java.lang.reflect.Array;
 
 import org.junit.Assert;