# HG changeset patch
# User pchelko
# Date 1381499870 -14400
# Node ID bf72e65e6f917be065978d3253eb58d78ec89d17
# Parent  12f343590d5adb9411efe8aa1a71be021cb17c0e
8026262: NPE in SystemFlavorMap.getAllNativesForType - regression in jdk8 b110 by fix of #JDK-8024987
Reviewed-by: art, serb

diff -r 12f343590d5a -r bf72e65e6f91 jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java
--- a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java	Fri Oct 11 16:44:42 2013 +0400
+++ b/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java	Fri Oct 11 17:57:50 2013 +0400
@@ -1324,7 +1324,7 @@
         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<>();
                 }