#196083: preventing NPE.
authorJan Lahoda <jlahoda@netbeans.org>
Tue, 01 Mar 2011 16:03:00 +0100
changeset 17307d07ca77dd59d
parent 17306 942efeb39a60
child 17308 bca6b070e8d1
#196083: preventing NPE.
java.ext.editor/nbproject/project.properties
java.ext.editor/src/org/netbeans/modules/java/editor/ext/fold/ClosureCodeCompletion.java
     1.1 --- a/java.ext.editor/nbproject/project.properties	Fri Feb 25 11:23:48 2011 -0800
     1.2 +++ b/java.ext.editor/nbproject/project.properties	Tue Mar 01 16:03:00 2011 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  javac.source=1.6
     1.5  javac.compilerargs=-Xlint -Xlint:-serial
     1.6  nbm.module.author=jlahoda@netbeans.org
     1.7 -spec.version.base=1.27.0
     1.8 +spec.version.base=1.28.0
     1.9  requires.nb.javac=true
     2.1 --- a/java.ext.editor/src/org/netbeans/modules/java/editor/ext/fold/ClosureCodeCompletion.java	Fri Feb 25 11:23:48 2011 -0800
     2.2 +++ b/java.ext.editor/src/org/netbeans/modules/java/editor/ext/fold/ClosureCodeCompletion.java	Tue Mar 01 16:03:00 2011 +0100
     2.3 @@ -116,9 +116,11 @@
     2.4  
     2.5      @Override
     2.6      protected void query(final CompletionResultSet resultSet, Document doc, final int caretOffset) {
     2.7 -        JavaSource js = JavaSource.forDocument(doc);
     2.8 +        try {
     2.9 +            JavaSource js = JavaSource.forDocument(doc);
    2.10  
    2.11 -        try {
    2.12 +            if (js == null) return;
    2.13 +            
    2.14              js.runUserActionTask(new Task<CompilationController>() {
    2.15                  public void run(CompilationController cc) throws Exception {
    2.16                      cc.toPhase(Phase.RESOLVED);