Java 9 declares java.activation as optional module.

paul-hammant · Apr 7, 2017 · 4c3c487 · 4c3c487
1 parent ae9eaa5
commit 4c3c487
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/xstream/src/java/com/thoughtworks/xstream/XStream.java b/xstream/src/java/com/thoughtworks/xstream/XStream.java
@@ -758,7 +758,11 @@ protected void setupAliases() {
             alias("awt-color", JVM.loadClassForName("java.awt.Color", false));
             alias("awt-font", JVM.loadClassForName("java.awt.Font", false));
             alias("awt-text-attribute", JVM.loadClassForName("java.awt.font.TextAttribute"));
-            alias("activation-data-flavor", JVM.loadClassForName("javax.activation.ActivationDataFlavor"));
+        }
+
+        Class<?> type = JVM.loadClassForName("javax.activation.ActivationDataFlavor");
+        if (type != null) {
+            alias("activation-data-flavor", type);
         }
 
         if (JVM.isSQLAvailable()) {