Patches from Stephen Crawley

        * java/util/PropertyPermission.java: Fix to prevent recursive
call during
        initialization
        * java/io/FileDescriptor.java (close) : clear nativeFD on
success
        * java/net/PlainDatagramSocketImpl.java (setTTL): remap the TTL
passed
          as an unsigned byte to an integer in the range 0..255
        * native/jni/java-net/javanet.c (_javanet_get_option):
          implement ..._get(SOCKOPT_SO_BINDADDR) -> 'getsockname'
syscall
        * native/jni/java-net/javanet.c (_javanet_set_option):
          implement ..._set(SOCKOPT_SO_BINDADDR) -> Exception

1 files changed, 26 insertions, 3 deletions

diff --git a/java/util/PropertyPermission.java b/java/util/PropertyPermission.java
index bb03e45f3..0d439d888 100644
--- a/java/util/PropertyPermission.java
+++ b/java/util/PropertyPermission.java
@@ -121,7 +121,7 @@ public final class PropertyPermission extends BasicPermission
     super(name);
     if (actions == null)
       throw new IllegalArgumentException();
-    setActions(actions.toLowerCase());
+    setActions(actions);
   }
 
   /**
@@ -134,14 +134,37 @@ public final class PropertyPermission extends BasicPermission
    */
   private void setActions(String str)
   {
+    // Initialising the class java.util.Locale ...
+    //    tries to initialise the Locale.defaultLocale static
+    //    which calls System.getProperty, 
+    //    which calls SecurityManager.checkPropertiesAccess,
+    //    which creates a PropertyPermission with action "read,write",
+    //    which calls setActions("read,write").
+    // If we now were to call toLowerCase on 'str',
+    //    this would call Locale.getDefault() which returns null
+    //       because Locale.defaultLocale hasn't been set yet
+    //    then toLowerCase will fail with a null pointer exception.
+    // 
+    // The solution is to take a punt on 'str' being lower case, and
+    // test accordingly.  If that fails, we convert 'str' to lower case 
+    // and try the tests again.
     if ("read".equals(str))
       actions = READ;
     else if ("write".equals(str))
       actions = WRITE;
     else if ("read,write".equals(str) || "write,read".equals(str))
       actions = READ | WRITE;
-    else
-      throw new IllegalArgumentException("illegal action " + str);
+    else {
+      String lstr = str.toLowerCase();
+      if ("read".equals(lstr))
+	actions = READ;
+      else if ("write".equals(lstr))
+	actions = WRITE;
+      else if ("read,write".equals(lstr) || "write,read".equals(lstr))
+	actions = READ | WRITE;
+      else
+	throw new IllegalArgumentException("illegal action " + str);
+    }
   }
 
   /**