From 069bb731a33a4b440b4b47ef89ecfa1f9207026a Mon Sep 17 00:00:00 2001 From: pchelko Date: Fri, 11 Oct 2013 17:57:50 +0400 Subject: [PATCH] 8026262: NPE in SystemFlavorMap.getAllNativesForType - regression in jdk8 b110 by fix of #JDK-8024987 Reviewed-by: art, serb --- src/share/classes/java/awt/datatransfer/SystemFlavorMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java index ef154acdc..1258881c1 100644 --- a/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java +++ b/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java @@ -1324,7 +1324,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { List retval = null; for (DataFlavor dataFlavor : convertMimeTypeToDataFlavors(type)) { List natives = getFlavorToNative().get(dataFlavor); - if (!natives.isEmpty()) { + if (natives != null && !natives.isEmpty()) { if (retval == null) { retval = new ArrayList<>(); } -- GitLab