Bug 875156 - NPE in code completion

Method getContextMatches from JavascriptCompletor now verifies if the baseObject is not null.
rhq-project · Oct 24, 2015 · ee0578f · ee0578f
1 parent 86bbcd5
commit ee0578f
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/.../scripting/javascript/src/main/java/org/rhq/scripting/javascript/JavascriptCompletor.java b/.../scripting/javascript/src/main/java/org/rhq/scripting/javascript/JavascriptCompletor.java
@@ -461,25 +461,27 @@ private Map<String, Object> getContextMatches(String start, Class<?> typeFilter)
     private Map<String, List<Object>> getContextMatches(PrintWriter output, Object baseObject, String start) {
         Map<String, List<Object>> found = new HashMap<String, List<Object>>();
 
-        Class<?> baseObjectClass = null;
-        if (baseObject instanceof Class) {
-            baseObjectClass = (Class<?>) baseObject;
-        } else {
-            baseObjectClass = baseObject.getClass();
-        }
-
-        try {
-            if (baseObjectClass.equals(Void.TYPE)) {
-                return found;
-            } else if (ScriptableObject.class.isAssignableFrom(baseObjectClass)) {
-                return findJavascriptContextMatches((ScriptableObject) baseObject, start);
+        if (baseObject != null) {
+            Class<?> baseObjectClass = null;
+            if (baseObject instanceof Class) {
+                baseObjectClass = (Class<?>) baseObject;
             } else {
-                return findJavaBeanContextMatches(baseObject, baseObjectClass, start);
+                baseObjectClass = baseObject.getClass();
             }
 
-        } catch (Exception e) {
-            LOG.info("Failure during code completion", e);
-            e.printStackTrace(output);
+            try {
+                if (baseObjectClass.equals(Void.TYPE)) {
+                    return found;
+                } else if (ScriptableObject.class.isAssignableFrom(baseObjectClass)) {
+                    return findJavascriptContextMatches((ScriptableObject) baseObject, start);
+                } else {
+                    return findJavaBeanContextMatches(baseObject, baseObjectClass, start);
+                }
+
+            } catch (Exception e) {
+                LOG.info("Failure during code completion", e);
+                e.printStackTrace(output);
+            }
         }
 
         return found;