# HG changeset patch
# User sam@core.djss.net
# Date 1321384547 21600
# Branch code-completion-controller
# Node ID 4aedbd42e446df0d239b10a8251d4707aeb4971f
# Parent  80ad0a41dc2b1c6ccfbc9e0c57fb2f26a3cd2845
Fix NullPointerException in code completion

diff -r 80ad0a41dc2b -r 4aedbd42e446 editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
--- a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	Thu Nov 10 23:09:26 2011 -0600
+++ b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	Tue Nov 15 13:15:47 2011 -0600
@@ -1794,7 +1794,7 @@
             synchronized (resultSets) {
                 if (controller == null) {
                     if (resultSets.isEmpty()) {
-                        return null;
+                        return FALLBACK_COMPLETION_CONTROLLER;
                     }
 
                     JTextComponent component = getActiveComponent();