[hg] main-silver: avoid NPE in AutoupdateSettings

[Jiri Rechtacek < >]

changeset 49e989ad5f3a in main-silver (installer_196075)
details: http://hg.netbeans.org/main-silver/rev/49e989ad5f3a
description:
        avoid NPE in AutoupdateSettings

diffstat:

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

diffs (34 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
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
  * Other names may be trademarks of their respective owners.
@@ -338,7 +338,7 @@
         File superFile = getSuperFileOsSpecific();
         err.log (Level.FINE, "Does OS specific " + superFile + " exist? " + 
superFile.exists ());
         
-        if (superFile.exists()) {
+        if (superFile != null && superFile.exists()) {
             return superFile;
         }
         
@@ -361,8 +361,11 @@
 
     
     private static File getSuperFileOsSpecific () {
-        String defaultUserdirRoot = System.getProperty 
("netbeans.default_userdir_root"); // NOI18N
+        String defaultUserdirRoot = System.getProperty 
("netbeans.default_userdir_root", null); // NOI18N
         err.log (Level.FINER, "netbeans.default_userdir_root: " + 
defaultUserdirRoot);
+        if (defaultUserdirRoot == null) {
+            return null;
+        }
         File nbDir = new File (defaultUserdirRoot);
         nbDir.mkdirs ();
         return new File (nbDir, SUPER_IDENTITY_FILE_NAME);