Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741
This commit is contained in:
Andrew John Hughes
2012-03-23 15:19:26 +00:00
parent 21669dfe20
commit 0563022a20
516 changed files with 64503 additions and 61116 deletions
@@ -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";