From c002447a5e7409b3ac8db35a3e07fae8a08bee51 Mon Sep 17 00:00:00 2001
From: Petr Pchelko <pchelko@openjdk.org>
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
---
 .../share/classes/java/awt/datatransfer/SystemFlavorMap.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java
index ef154acdc2e..1258881c1e8 100644
--- a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java
+++ b/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java
@@ -1324,7 +1324,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable {
         List<String> retval = null;
         for (DataFlavor dataFlavor : convertMimeTypeToDataFlavors(type)) {
             List<String> natives = getFlavorToNative().get(dataFlavor);
-            if (!natives.isEmpty()) {
+            if (natives != null && !natives.isEmpty()) {
                 if (retval == null) {
                     retval = new ArrayList<>();
                 }