diff options
| author | Andrew John Hughes <gandalf@gcc.gnu.org> | 2012-03-23 15:19:26 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gandalf@gcc.gnu.org> | 2012-03-23 15:19:26 +0000 |
| commit | 0563022a206294757effa44686727bffc4f7c2bd (patch) | |
| tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/classpath/java/security/KeyStore.java | |
| parent | 21669dfe20db0246ece395db5558a081a5c7088f (diff) | |
| download | gcc-0563022a206294757effa44686727bffc4f7c2bd.tar.gz | |
Merge GNU Classpath 0.99 into libjava.
From-SVN: r185741
Diffstat (limited to 'libjava/classpath/java/security/KeyStore.java')
| -rw-r--r-- | libjava/classpath/java/security/KeyStore.java | 7 |
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"; |