From 6cd64781a7cda192bc2b0a555974037fd16cc2c5 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Wed, 11 Jul 2012 14:54:32 -0400 Subject: Misc Fixes Remaining part of the code. --- base/common/src/com/netscape/cmscore/apps/CMSEngine.java | 2 +- base/common/src/com/netscape/cmscore/base/SimpleProperties.java | 2 +- base/common/src/com/netscape/cmscore/cert/CertDateCompare.java | 5 ++++- base/common/src/com/netscape/cmscore/cert/CertUtils.java | 2 +- base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java | 6 +----- base/common/src/com/netscape/cmscore/connector/LocalConnector.java | 2 +- base/common/src/com/netscape/cmscore/security/PWsdrCache.java | 1 - 7 files changed, 9 insertions(+), 11 deletions(-) (limited to 'base/common/src/com/netscape') diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index 84afb8474..8020a6562 100644 --- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -202,6 +202,7 @@ public class CMSEngine implements ICMSEngine { private ISecurityDomainSessionTable mSecurityDomainSessionTable = null; private String mConfigSDSessionId = null; private Timer mSDTimer = null; + private String mServerCertNickname = null; // static subsystems - must be singletons private static SubsystemInfo[] mStaticSubsystems = { @@ -249,7 +250,6 @@ public class CMSEngine implements ICMSEngine { private static final int EE_SSL = 2; private static final int EE_NON_SSL = 3; private static final int EE_CLIENT_AUTH_SSL = 4; - private static String mServerCertNickname = null; private static String info[][] = { { null, null, null },//agent { null, null, null },//admin { null, null, null },//sslEE diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java index c1ec27a8c..2fa319ffc 100644 --- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java +++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java @@ -365,7 +365,7 @@ public class SimpleProperties extends Hashtable { * @return the value in this property list with the specified key value. * @see java.util.Properties#defaults */ - public String getProperty(String key, String defaultValue) { + public synchronized String getProperty(String key, String defaultValue) { String val = getProperty(key); return (val == null) ? defaultValue : val; diff --git a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java index 30f806ea2..c39db40d0 100644 --- a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java +++ b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java @@ -28,7 +28,10 @@ import netscape.security.x509.X509CertImpl; * @author kanda * @version $Revision$, $Date$ */ -public class CertDateCompare implements Comparator { +public class CertDateCompare implements Comparator, java.io.Serializable { + + private static final long serialVersionUID = -1784015027375808580L; + public CertDateCompare() { } diff --git a/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/base/common/src/com/netscape/cmscore/cert/CertUtils.java index b7942e5a1..37444eff5 100644 --- a/base/common/src/com/netscape/cmscore/cert/CertUtils.java +++ b/base/common/src/com/netscape/cmscore/cert/CertUtils.java @@ -842,7 +842,7 @@ public class CertUtils { return false; } - if (certusage == "") + if (certusage == null || certusage.equals("")) CMS.debug("CertUtils: verifySystemCertByNickname(): required certusage not defined, getting current certusage"); CMS.debug("CertUtils: verifySystemCertByNickname(): calling isCertValid()"); try { diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java index c5e3312e1..a55a186e3 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java @@ -296,8 +296,4 @@ public class HttpConnFactory { "In Http (bound) connection pool to" + msg); } - - protected void finalize() - throws Exception { - } -} +} \ No newline at end of file diff --git a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java index ed0d5aa6d..c4eb78625 100644 --- a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java +++ b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java @@ -183,7 +183,7 @@ public class LocalConnector implements IConnector { // are persistent before the servicing. // Please see stateEngine() function in // ARequestQueue.java for details. - r = mSourceReqs.get(rId); + r = mSourceReqs.get(rId.toString()); if (r != null) { if (r.getRequestStatus() != RequestStatus.SVC_PENDING) { mSource.log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java index e9c7af8e5..d723d55ed 100644 --- a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java +++ b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java @@ -128,7 +128,6 @@ public class PWsdrCache { cm = CryptoManager.getInstance(); if (mTokenName != null) { mToken = cm.getTokenByName(mTokenName); - mToken = cm.getInternalKeyStorageToken(); debug("PWsdrCache: mToken = " + mTokenName); } else { mToken = cm.getInternalKeyStorageToken(); -- cgit