Skip to content

Added rebuildToolList() to fix nullpointer in contributions check #1381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Stefterv wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −8
Open

Added rebuildToolList() to fix nullpointer in contributions check #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/processing/app/Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ public Base(String[] args) throws Exception {
buildCoreModes();
rebuildContribModes();
rebuildContribExamples();
rebuildToolList();

// Needs to happen after the sketchbook folder has been located.
// Also relies on the modes to be loaded, so it knows what can be
Expand Down
20 changes: 12 additions & 8 deletions app/src/processing/app/contrib/ContributionListing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@
*/
package processing.app.contrib;

import java.awt.EventQueue;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.net.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;

import processing.app.Base;
import processing.app.Messages;
import processing.app.UpdateCheck;
Expand All @@ -37,6 +29,16 @@
import processing.data.StringDict;
import processing.data.StringList;

import java.awt.*;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;


public class ContributionListing {
static volatile ContributionListing singleInstance;
Expand Down Expand Up @@ -275,6 +277,8 @@ public void downloadAvailableList(final Base base,
} catch (MalformedURLException e) {
progress.setException(e);
progress.finished();
} catch (Exception e) {
Messages.log(e.getMessage());
} finally {
downloadingLock.unlock();
}
Expand Down