[hg] main-silver: #208201: Bug 208201 - NullPointerException on ...

[Jiri Rechtacek < >]

changeset 581d23afe00f in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/581d23afe00f
description:
        #208201: Bug 208201 - NullPointerException on start of application 
based on RCP

diffstat:

 
autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
 |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (21 lines):

diff --git 
a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
 
b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
--- 
a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
+++ 
b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
@@ -347,7 +347,7 @@
         // 3. get superIf from .netbeans (a old place)
         File nbDir = new File (home, DEFAULT_NETBEANS_DIR);
         err.log (Level.FINE, "Does " + nbDir + " exist? " + nbDir.exists());
-        if (nbDir.exists()) {
+        if (nbDir.exists() && superFile != null) {
             File oldPlaceSuperFile = new File (nbDir, 
SUPER_IDENTITY_FILE_NAME);
             err.log (Level.FINE, "Does " + oldPlaceSuperFile + " exist on 
the old place? " + oldPlaceSuperFile.exists ());
             if (oldPlaceSuperFile.exists()) {
@@ -357,6 +357,8 @@
                     writeSuperFile(superFile, id);
                 }
             }
+        } else if (nbDir.exists() && superFile == null) {
+            superFile = new File (nbDir, SUPER_IDENTITY_FILE_NAME);
         }
         return superFile;
     }