figuring out ClassLoader issues with new ext.dirs setup

benfry · benfry · commit ddeff1266ea5 · 2016-08-07T19:38:58.000-04:00
diff --git a/app/src/processing/app/contrib/ModeContribution.java b/app/src/processing/app/contrib/ModeContribution.java
@@ -104,14 +104,14 @@ public ModeContribution(Base base, File folder,
   public void clearClassLoader(Base base) {
     List<ModeContribution> contribModes = base.getModeContribs();
     int botherToRemove = contribModes.indexOf(this);
-    if (botherToRemove != -1) { // The poor thing isn't even loaded, and we're trying to remove it...
+    // The poor thing isn't even loaded, and we're trying to remove it...
+    if (botherToRemove != -1) {
       contribModes.remove(botherToRemove);
 
       try {
+        // This cast should be safe, since the only case when loader is not a
+        // URLClassLoader is when no archives were found in the first place.
         ((URLClassLoader) loader).close();
-        // The typecast should be safe, since the only case when loader is not of
-        // type URLClassLoader is when no archives were found in the first
-        // place...
       } catch (IOException e) {
         e.printStackTrace();
       }
@@ -161,8 +161,8 @@ public String initLoader(Base base, String className) throws Exception {
 
       ArrayList<URL> extraUrls = new ArrayList<>();
       if (imports != null && imports.size() > 0) {
-        // if the mode has any dependencies (defined as imports in mode.properties),
-        // add the dependencies to the classloader
+        // if the mode has any dependencies (defined as imports in
+        // mode.properties), add the dependencies to the classloader
 
         HashMap<String, Mode> installedModes = new HashMap<>();
         for(Mode m: base.getModeList()){
diff --git a/build/build.xml b/build/build.xml
@@ -560,7 +560,7 @@
       <option value="-Djna.nosys=true" />
 
       <!-- deal with jokers who install JOGL, ANTLR, etc system-wide -->
-      <option value="-Djava.ext.dirs=lib/ext" />
+      <option value="-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk${jdk.esoteric}.jdk/Contents/Home/jre/lib/ext" />
 
       <option value="-Dapple.laf.useScreenMenuBar=true" />
       <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
