--- old/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java	2016-12-08 13:45:40.000000000 -0800
+++ new/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java	2016-12-08 13:45:40.000000000 -0800
@@ -183,9 +183,10 @@
             setShortDescription(description.toString());
         }
         Object values = info.get(PropertyInfo.Name.enumerationValues);
-        if (values != null) {
-            setValue(PropertyInfo.Name.enumerationValues.name(), values);
+        if (values == null) {
+            values = new Object[0];
         }
+        setValue(PropertyInfo.Name.enumerationValues.name(), values);
         this.baseName = base;
     }