# HG changeset patch
# User martin
# Date 1518655040 28800
#      Wed Feb 14 16:37:20 2018 -0800
# Node ID e9676e9ca3d6f6645c2e84a2257740f55d620569
# Parent  fdd4a131d766e500664539ac82782685aef25528
8197893: Mistaken type check in CheckedEntrySet.toArray
Reviewed-by: psandoz

diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java
--- a/src/java.base/share/classes/java/util/Collections.java
+++ b/src/java.base/share/classes/java/util/Collections.java
@@ -3771,9 +3771,9 @@
                  * Ensure that we don't get an ArrayStoreException even if
                  * s.toArray returns an array of something other than Object
                  */
-                Object[] dest = (CheckedEntry.class.isInstance(
-                    source.getClass().getComponentType()) ? source :
-                                 new Object[source.length]);
+                Object[] dest = (source.getClass() == Object[].class)
+                    ? source
+                    : new Object[source.length];
 
                 for (int i = 0; i < source.length; i++)
                     dest[i] = checkedEntry((Map.Entry<K,V>)source[i],