From 0563022a206294757effa44686727bffc4f7c2bd Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gandalf@gcc.gnu.org>
Date: Fri, 23 Mar 2012 15:19:26 +0000
Subject: Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741
---
 libjava/classpath/java/security/KeyStore.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libjava/classpath/java/security/KeyStore.java')

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";
-- 
cgit v1.2.3