summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/ca/src/com/netscape/ca/CRLIssuingPoint.java40
-rw-r--r--base/common/src/com/netscape/certsrv/util/StatsEvent.java6
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java16
-rw-r--r--base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java16
-rw-r--r--base/common/src/com/netscape/cmscore/security/CertificateInfo.java8
5 files changed, 40 insertions, 46 deletions
diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index 56dcc2457..5dd823737 100644
--- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -1694,23 +1694,24 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
* <P>
*/
public void run() {
- while (mEnable && ((mEnableCRLCache && mCacheUpdateInterval > 0) ||
- (mInitialized == CRL_IP_NOT_INITIALIZED) ||
- mDoLastAutoUpdate || (mEnableCRLUpdates &&
+ try {
+ while (mEnable && ((mEnableCRLCache && mCacheUpdateInterval > 0) ||
+ (mInitialized == CRL_IP_NOT_INITIALIZED) ||
+ mDoLastAutoUpdate || (mEnableCRLUpdates &&
+ ((mEnableDailyUpdates && mDailyUpdates != null &&
+ mTimeListSize > 0) ||
+ (mEnableUpdateFreq && mAutoUpdateInterval > 0) ||
+ mDoManualUpdate)))) {
+
+ synchronized (this) {
+ long delay = 0;
+ long delay2 = 0;
+ boolean doCacheUpdate = false;
+ boolean scheduledUpdates = mEnableCRLUpdates &&
((mEnableDailyUpdates && mDailyUpdates != null &&
- mTimeListSize > 0) ||
- (mEnableUpdateFreq && mAutoUpdateInterval > 0) ||
- mDoManualUpdate)))) {
-
- synchronized (this) {
- long delay = 0;
- long delay2 = 0;
- boolean doCacheUpdate = false;
- boolean scheduledUpdates = mEnableCRLUpdates &&
- ((mEnableDailyUpdates && mDailyUpdates != null &&
- mTimeListSize > 0) ||
- (mEnableUpdateFreq && mAutoUpdateInterval > 0));
- try {
+ mTimeListSize > 0) ||
+ (mEnableUpdateFreq && mAutoUpdateInterval > 0));
+
if (mInitialized == CRL_IP_NOT_INITIALIZED)
initCRL();
@@ -1766,11 +1767,12 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
mSignatureAlgorithmForManualUpdate = null;
}
}
- } catch (EBaseException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+
}
}
+ } catch (EBaseException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
}
mUpdateThread = null;
}
diff --git a/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/base/common/src/com/netscape/certsrv/util/StatsEvent.java
index c431a3908..4137aa3b2 100644
--- a/base/common/src/com/netscape/certsrv/util/StatsEvent.java
+++ b/base/common/src/com/netscape/certsrv/util/StatsEvent.java
@@ -63,9 +63,7 @@ public class StatsEvent {
*/
public Enumeration<String> getSubEventNames() {
Vector<String> names = new Vector<String>();
- for (String s : mSubEvents.keySet()) {
- names.add(s);
- }
+ names.addAll(mSubEvents.keySet());
return names.elements();
}
@@ -83,9 +81,7 @@ public class StatsEvent {
mTimeTaken = 0;
mTimeTakenSqSum = 0;
for (StatsEvent c : mSubEvents.values()) {
- if (c != null) {
c.resetCounters();
- }
}
}
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
index 71f889895..8c2b730d5 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
@@ -326,15 +326,13 @@ class PredicateTokenizer {
Debug.trace("Malformed expression: Null Token");
throw new ELdapException(CMS.getUserMessage("CMS_LDAP_BAD_LDAP_EXPRESSION"));
}
- if (toReturn == null)
- return null;
- else {
- String trimmed = toReturn.trim();
- if (trimmed == null || trimmed.length() == 0)
- return nextToken();
- else
- return trimmed;
- }
+ String trimmed = toReturn.trim();
+
+ if (trimmed.length() == 0)
+ return nextToken();
+ else
+ return trimmed;
+
}
}
diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
index 579d9ff5b..09316ceff 100644
--- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
+++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
@@ -329,15 +329,13 @@ class PredicateTokenizer {
Debug.trace("Malformed Predicate Expression : No Tokens");
throw new EPolicyException("Malformed Predicate Expression : No Tokens");
}
- if (toReturn == null)
- return null;
- else {
- String trimmed = toReturn.trim();
- if (trimmed == null || trimmed.length() == 0)
- return nextToken();
- else
- return trimmed;
- }
+ String trimmed = toReturn.trim();
+
+ if (trimmed.length() == 0)
+ return nextToken();
+ else
+ return trimmed;
+
}
}
diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
index 040abc3c2..fef733a11 100644
--- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
+++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
@@ -187,10 +187,10 @@ public abstract class CertificateInfo {
if (algm == null) {
String hashtype = (String) mProperties.get(ConfigConstants.PR_HASH_TYPE);
-
- algm = KeyCertUtil.getSigningAlgorithm(getKeyAlgorithm(), hashtype);
+ String key = getKeyAlgorithm();
+ algm = KeyCertUtil.getSigningAlgorithm(key, hashtype);
if (algm == null) {
- throw new NoSuchAlgorithmException();
+ throw new NoSuchAlgorithmException("No Algorithm for Key : " + key + " and Hashtype : " + hashtype);
}
mProperties.put(Constants.PR_SIGNATURE_ALGORITHM, algm);
}
@@ -212,7 +212,7 @@ public abstract class CertificateInfo {
} catch (IOException e) {
throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_CERT", e.toString()));
} catch (NoSuchAlgorithmException e) {
- throw new EBaseException(CMS.getUserMessage("CMS_BASE_ALG_NOT_SUPPORTED", ""));
+ throw new EBaseException(CMS.getUserMessage("CMS_BASE_ALG_NOT_SUPPORTED", e.toString()));
}
return certInfo;