src/solaris/classes/java/util/prefs/FileSystemPreferences.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -899,19 +899,21 @@
         for (int i = 0; i < MAX_ATTEMPTS; i++) {
             try {
                   int perm = (usernode? USER_READ_WRITE: USER_RW_ALL_READ);
                   result = lockFile0(lockFile.getCanonicalPath(), perm, shared);
 
+                if (result != null) {
                   errorCode = result[ERROR_CODE];
                   if (result[LOCK_HANDLE] != 0) {
                      if (usernode) {
                          userRootLockHandle = result[LOCK_HANDLE];
                      } else {
                          systemRootLockHandle = result[LOCK_HANDLE];
                      }
                      return true;
                   }
+                }
             } catch(IOException e) {
 //                // If at first, you don't succeed...
             }
 
             try {