Changeset 31733

Timestamp:

2017-06-13T20:38:27+12:00 (6 years ago)

Author:

ak19

Message:

Bugfix to nullpointer exception caused when converting a GS2 collection to GS3. OpenCollectionDialog.convertToGS3Collection(OpenCollectionDialog.java:400) was passing in null as the caller parameter to the GShell constructor. This is added to the GShell's listener's list. Need to avoid adding null callers to listener list, to avoid firing off events to null variables.

File:

• main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -143 +143 @@
     this.setPriority(Thread.MIN_PRIORITY);
     listeners = new CopyOnWriteArrayList<GShellListener>();
-    listeners.add(caller);
+    if(caller != null) {
+        listeners.add(caller);
+    }
     }
     /** This method adds another shell listener to this process.