Fixes a NPE in JsConsoleManager.executeFile() that may make BC hang

bioclipse · Nov 8, 2012 · bf92152 · bf92152
1 parent 9264836
commit bf92152
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.../net.bioclipse.scripting.ui/src/net/bioclipse/scripting/ui/business/JsConsoleManager.java b/.../net.bioclipse.scripting.ui/src/net/bioclipse/scripting/ui/business/JsConsoleManager.java
@@ -120,10 +120,17 @@ protected IStatus run(final IProgressMonitor monitor) {
                     new ScriptAction(contents, new Hook() {
                         public void run( Object result ) {
                             monitor.done();
-                            if ( !"org.mozilla.javascript.Undefined".equals(
-                                    result.getClass().getName() ) ) {
-                                message(result.toString());
+                            /* If the result is null and the user make an tab-
+                             * completion, Bioclipse will hang. 
+                             * TODO Find a better solution */
+                            if (result != null) {
+                                if ( !"org.mozilla.javascript.Undefined"
+                                        .equals(result.getClass().getName() ) ) {
+                                    message(result.toString());
+                                }
                             }
+                            else 
+                                message("Script finished without any problems.");
                         }
 
                         private void message(final String text) {