diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2012-07-19 12:46:10 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-25 10:41:57 -0500 |
| commit | ca401c4f9e30ab59cb12fc4098aec21b660f686f (patch) | |
| tree | 9a4a349bcfaa195960801264ca36e639b896cb89 /base/common/src/com | |
| parent | 2a3125d54365bf1806633c3301ce59fdb21461e4 (diff) | |
| download | pki-ca401c4f9e30ab59cb12fc4098aec21b660f686f.tar.gz pki-ca401c4f9e30ab59cb12fc4098aec21b660f686f.tar.xz pki-ca401c4f9e30ab59cb12fc4098aec21b660f686f.zip | |
Patch 25 - Misc Fixes
Diffstat (limited to 'base/common/src/com')
6 files changed, 4 insertions, 8 deletions
diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java index 2fa319ffc..38c17d861 100644 --- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java +++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java @@ -347,7 +347,7 @@ public class SimpleProperties extends Hashtable<String, String> { * @return the value in this property list with the specified key value. * @see java.util.Properties#defaults */ - public String getProperty(String key) { + public synchronized String getProperty(String key) { String oval = super.get(key); return ((oval == null) && (defaults != null)) ? defaults.getProperty(key) : oval; diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index 699877ffa..8d98f21b7 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -260,7 +260,6 @@ public class LdapPredicateParser { class PredicateTokenizer { String input; int currentIndex; - int endOfString; String nextToken; public PredicateTokenizer(String predString) { diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 849417869..c55b84ece 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -263,7 +263,6 @@ public class PolicyPredicateParser { class PredicateTokenizer { String input; int currentIndex; - int endOfString; String nextToken; public PredicateTokenizer(String predString) { diff --git a/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/base/common/src/com/netscape/cmscore/security/CASigningCert.java index 8d35acf1b..701ac4c18 100644 --- a/base/common/src/com/netscape/cmscore/security/CASigningCert.java +++ b/base/common/src/com/netscape/cmscore/security/CASigningCert.java @@ -91,8 +91,7 @@ public class CASigningCert extends CertificateInfo { } // get PQG params from the configuration file - public static PQGParams getPQGParams() throws EBaseException, IOException, - PQGParamGenException { + public PQGParams getPQGParams() throws EBaseException, IOException, PQGParamGenException { byte[] p = mConfig.getByteArray("ca.dsaP", null); byte[] q = mConfig.getByteArray("ca.dsaQ", null); diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index c4d776934..58eb9ae63 100644 --- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -70,7 +70,7 @@ public abstract class CertificateInfo { protected KeyCertData mProperties; protected KeyPair mKeyPair; - protected static IConfigStore mConfig; + protected IConfigStore mConfig; public CertificateInfo(KeyCertData properties) { this(properties, null); diff --git a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java index 07ae9ee2f..08cdd92e8 100644 --- a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java +++ b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java @@ -69,8 +69,7 @@ public class OCSPSigningCert extends CertificateInfo { } // get PQG params from the configuration file - public static PQGParams getPQGParams() throws EBaseException, IOException, - PQGParamGenException { + public PQGParams getPQGParams() throws EBaseException, IOException, PQGParamGenException { byte[] p = mConfig.getByteArray("ca.dsaP", null); byte[] q = mConfig.getByteArray("ca.dsaQ", null); |