catch null folder list on startup (fixes #5823)

benfry · benfry · commit 65a73ec65a3f · 2020-01-17T10:42:23.000-05:00
diff --git a/app/src/processing/app/contrib/ContributionManager.java b/app/src/processing/app/contrib/ContributionManager.java
@@ -619,16 +619,21 @@ public boolean accept(File folder) {
       }
     });
 
-    for (File file : installList) {
-      for (AvailableContribution contrib : listing.advertisedContributions) {
-        if (file.getName().equals(contrib.getName())) {
-          file.delete();
-          installOnStartUp(base, contrib);
-          EventQueue.invokeAndWait(() -> {
-            listing.replaceContribution(contrib, contrib);
-          });
+    // https://github.com/processing/processing/issues/5823
+    if (installList != null) {
+      for (File file : installList) {
+        for (AvailableContribution contrib : listing.advertisedContributions) {
+          if (file.getName().equals(contrib.getName())) {
+            file.delete();
+            installOnStartUp(base, contrib);
+            EventQueue.invokeAndWait(() -> {
+              listing.replaceContribution(contrib, contrib);
+            });
+          }
         }
       }
+    } else {
+      System.err.println("Could not read " + root);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -619,16 +619,21 @@ public boolean accept(File folder) {`
`619`	`619`	`}`
`620`	`620`	`});`
`621`	`621`
`622`		`- for (File file : installList) {`
`623`		`- for (AvailableContribution contrib : listing.advertisedContributions) {`
`624`		`- if (file.getName().equals(contrib.getName())) {`
`625`		`- file.delete();`
`626`		`- installOnStartUp(base, contrib);`
`627`		`- EventQueue.invokeAndWait(() -> {`
`628`		`- listing.replaceContribution(contrib, contrib);`
`629`		`- });`
	`622`	`+ // https://github.com/processing/processing/issues/5823`
	`623`	`+ if (installList != null) {`
	`624`	`+ for (File file : installList) {`
	`625`	`+ for (AvailableContribution contrib : listing.advertisedContributions) {`
	`626`	`+ if (file.getName().equals(contrib.getName())) {`
	`627`	`+ file.delete();`
	`628`	`+ installOnStartUp(base, contrib);`
	`629`	`+ EventQueue.invokeAndWait(() -> {`
	`630`	`+ listing.replaceContribution(contrib, contrib);`
	`631`	`+ });`
	`632`	`+ }`
`630`	`633`	`}`
`631`	`634`	`}`
	`635`	`+ } else {`
	`636`	`+ System.err.println("Could not read " + root);`
`632`	`637`	`}`
`633`	`638`	`}`
`634`	`639`