diff options
author | Abhishek Koneru <akoneru@redhat.com> | 2012-06-26 15:37:15 -0400 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-02 12:44:05 -0500 |
commit | 0f3451befbc14bd6ec29d9e1e3845f970f288653 (patch) | |
tree | 346822835936131b9dc6c5fd8692ce9c60eeda03 /base/common/src/com/netscape/cmscore | |
parent | 10502e34a10fb3b672aef1161cc271003c7806ba (diff) | |
download | pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.tar.gz pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.tar.xz pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.zip |
LeftOver Cases in Resource Leaks and NULL_RETURNS
Diffstat (limited to 'base/common/src/com/netscape/cmscore')
3 files changed, 13 insertions, 7 deletions
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java index fb3b9b24a..556cab9f5 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java @@ -515,7 +515,10 @@ public class KeyRepository extends Repository implements IKeyRepository { (KeyRecordList) findKeyRecordsInList(ldapfilter, attrs, serial_upper_bound.toString(10), "serialno", 5 * -1); - int size = recList.getSize(); + int size = -1; + if (recList != null) { + size = recList.getSize(); + } CMS.debug("KeyRepository: getLastSerialNumberInRange: recList size " + size); diff --git a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 82b515846..aa5714668 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -200,15 +200,14 @@ public class LogSubsystem implements ILogSubsystem { public String getLogPluginName(ILogEventListener log) { IConfigStore cs = log.getConfigStore(); - + if (cs == null) { + return ""; + } try { return cs.getString("pluginName", ""); } catch (EBaseException e) { e.printStackTrace(); return ""; - } catch (NullPointerException e) { - e.printStackTrace(); - return ""; } } diff --git a/base/common/src/com/netscape/cmscore/logging/Logger.java b/base/common/src/com/netscape/cmscore/logging/Logger.java index b27147f20..aec4caec7 100644 --- a/base/common/src/com/netscape/cmscore/logging/Logger.java +++ b/base/common/src/com/netscape/cmscore/logging/Logger.java @@ -203,7 +203,9 @@ public class Logger implements ILogger { */ public void log(int evtClass, Properties prop, int source, int level, String msg, Object params[]) { - mLogQueue.log(create(evtClass, prop, source, level, msg, params, ILogger.L_SINGLELINE)); + ILogEvent iLEvent = create(evtClass, prop, source, level, msg, params, ILogger.L_SINGLELINE); + if (iLEvent != null) + mLogQueue.log(iLEvent); } //******************** multiline log ************************* @@ -342,7 +344,9 @@ public class Logger implements ILogger { */ public void log(int evtClass, Properties prop, int source, int level, String msg, Object params[], boolean multiline) { - mLogQueue.log(create(evtClass, prop, source, level, msg, params, multiline)); + ILogEvent iLEvent = create(evtClass, prop, source, level, msg, params, multiline); + if (iLEvent != null) + mLogQueue.log(iLEvent); } //******************** end multiline log ************************* |