diff options
Diffstat (limited to 'base/common/src')
6 files changed, 20 insertions, 11 deletions
diff --git a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index ba3d9f293..f8f7588a7 100644 --- a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -91,13 +91,13 @@ public class ARequestNotifier implements IRequestNotifier { mRequestQueue = mCA.getRequestQueue(); if (mIsPublishingQueueEnabled && mSavePublishingStatus > 0 && mRequestQueue != null) { mPublishingStatus = mRequestQueue.getPublishingStatus(); - BigInteger status = new BigInteger("-2"); try { - status = new BigInteger(mPublishingStatus); + BigInteger status = new BigInteger(mPublishingStatus); if (status.compareTo(BigInteger.ZERO) > -1) { recoverPublishingQueue(mPublishingStatus); } } catch (Exception e) { + e.printStackTrace(); } } diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index 4eacf2236..855073916 100644 --- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -896,7 +896,6 @@ public class CMSEngine implements ICMSEngine { // load dyn subsystems. mDynSubsystems = new SubsystemInfo[nsubsystems]; - ssnames = ssconfig.getSubStoreNames(); for (int i = 0; i < mDynSubsystems.length; i++) { IConfigStore config = ssconfig.getSubStore(String.valueOf(i)); diff --git a/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/common/src/com/netscape/cmscore/connector/Resender.java index e1b19749a..73a399fdc 100644 --- a/base/common/src/com/netscape/cmscore/connector/Resender.java +++ b/base/common/src/com/netscape/cmscore/connector/Resender.java @@ -216,11 +216,9 @@ public class Resender implements IResender { RequestStatus replyStatus = RequestStatus.fromString(replymsg.reqStatus); int index = replymsg.reqId.lastIndexOf(':'); - RequestId replyRequestId = - new RequestId(replymsg.reqId.substring(index + 1)); if (Debug.ON) - Debug.trace("reply request id " + replyRequestId + + Debug.trace("reply request id " + replymsg.reqId.substring(index + 1) + " for request " + r.getRequestId()); if (replyStatus != RequestStatus.COMPLETE) { diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java index 1edee3812..79f2e91c4 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java @@ -338,8 +338,15 @@ public class LdapAnonConnFactory implements ILdapConnFactory { if (conn == null) { return; } + AnonConnection anon = null; + // check if conn is valid and from this factory. - AnonConnection anon = (AnonConnection) conn; + if (conn instanceof AnonConnection) { + anon = (AnonConnection) conn; + } else { + log(ILogger.LL_WARN, "returnConn : Connection is not an AnonConnection"); + return; + } if (anon.getFacId() != mConns) { // returning a connection not from this factory. diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java index 1da965a3a..c3e84f136 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java @@ -413,7 +413,14 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { if (conn == null) { return; } - BoundConnection boundconn = (BoundConnection) conn; + BoundConnection boundconn = null; + + if (conn instanceof BoundConnection) { + boundconn = (BoundConnection) conn; + } else { + log(ILogger.LL_WARN, "returnConn : Connection is not an BoundConnection"); + return; + } if (boundconn.getFacId() != mConns) { log(ILogger.LL_WARN, "returnConn: unknown connection."); diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 0ae6af0c3..6f5d29730 100644 --- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -1249,9 +1249,7 @@ public class SelfTestSubsystem throws EBaseException { // strip preceding/trailing whitespace // from passed-in String parameters - if (id != null) { - id = id.trim(); - } else { + if (id == null) { log(mLogger, CMS.getLogMessage( "CMSCORE_SELFTESTS_PROPERTY_NAME_IS_NULL")); |