Merge GNU Classpath 0.99 into libjava.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 1 deletions

diff --git a/libjava/classpath/java/security/KeyStore.java b/libjava/classpath/java/security/KeyStore.java
index b7a0e2ab1f1..25173e54370 100644
--- a/libjava/classpath/java/security/KeyStore.java
+++ b/libjava/classpath/java/security/KeyStore.java
@@ -214,7 +214,12 @@ public class KeyStore
   {
     // Security reads every property in java.security so it
     // will return this property if it exists.
-    String tmp = Security.getProperty("keystore.type");
+    String tmp = AccessController.doPrivileged(new PrivilegedAction<String> () {
+        public String run()
+        {
+          return Security.getProperty("keystore.type");
+        }
+      });
 
     if (tmp == null)
       tmp = "gkr";