diff options
Diffstat (limited to 'base/common/src/com/netscape/cmscore/apps/CMSEngine.java')
| -rw-r--r-- | base/common/src/com/netscape/cmscore/apps/CMSEngine.java | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index 855073916..cbdfee8fc 100644 --- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -308,13 +308,12 @@ public class CMSEngine implements ICMSEngine { CMS.debug("CMSEngine: getPasswordStore(): password store not initialized before."); String pwdClass = mConfig.getString("passwordClass"); - if (pwdClass != null) { - try { - mPasswordStore = (IPasswordStore) Class.forName(pwdClass).newInstance(); - } catch (Exception e) { - CMS.debug("CMSEngine: getPasswordStore(): password store initialization failure:" - + e.toString()); - } + try { + mPasswordStore = (IPasswordStore) Class.forName(pwdClass).newInstance(); + } catch (Exception e) { + CMS.debug("CMSEngine: getPasswordStore(): password store initialization failure:" + + e.toString()); + throw e; } } else { CMS.debug("CMSEngine: getPasswordStore(): password store initialized before."); @@ -1877,32 +1876,32 @@ public class CMSEngine implements ICMSEngine { checkRevReq.setExtData(IRequest.ISSUED_CERTS, agentCerts); queue.processRequest(checkRevReq); - } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_AGENT_PROCESS_CHECKING")); - } - RequestStatus status = checkRevReq.getRequestStatus(); + RequestStatus status = checkRevReq.getRequestStatus(); - if (status == RequestStatus.COMPLETE) { - Enumeration<String> enum1 = checkRevReq.getExtDataKeys(); + if (status == RequestStatus.COMPLETE) { + Enumeration<String> enum1 = checkRevReq.getExtDataKeys(); - while (enum1.hasMoreElements()) { - String name = enum1.nextElement(); + while (enum1.hasMoreElements()) { + String name = enum1.nextElement(); - if (name.equals(IRequest.REVOKED_CERTS)) { - revoked = true; + if (name.equals(IRequest.REVOKED_CERTS)) { + revoked = true; + if (mVCList != null) + mVCList.update(cert, VerifiedCert.REVOKED); + } + } + if (revoked == false) { if (mVCList != null) - mVCList.update(cert, VerifiedCert.REVOKED); + mVCList.update(cert, VerifiedCert.NOT_REVOKED); } - } - if (revoked == false) { + + } else { if (mVCList != null) - mVCList.update(cert, VerifiedCert.NOT_REVOKED); + mVCList.update(cert, VerifiedCert.CHECKED); } - - } else { - if (mVCList != null) - mVCList.update(cert, VerifiedCert.CHECKED); + } catch (EBaseException e) { + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_AGENT_PROCESS_CHECKING")); } } } |