# HG changeset patch
# User Sam Harwell <sam@tunnelvisionlabs.com>
# Date 1322125163 21600
# Branch code-completion-controller
# Node ID 7dfd3a44131b7d96fa1bf5a61cf3c2a396ddb5f3
# Parent  8b93ee60e38a9e3020b5ff35b2cd240c67540273
Fix NullPointerException in CompletionImpl

diff -r 8b93ee60e38a -r 7dfd3a44131b editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
--- a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	Sat Nov 19 00:37:30 2011 -0600
+++ b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	Thu Nov 24 02:59:23 2011 -0600
@@ -723,7 +723,7 @@
         }
         if (layout.isCompletionVisible()) {
             SelectedCompletionItem item = layout.getSelectedCompletionItem();
-            if (item != null) {
+            if (item != null && completionResult != null) {
                 sendUndoableEdit(doc, CloneableEditorSupport.BEGIN_COMMIT_GROUP);
                 try {
                     if (compEditable && !guardedPos) {