diff options
Diffstat (limited to 'base')
3 files changed, 3 insertions, 16 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java index 751a4cd63..1c477f751 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java +++ b/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogQueue; public class LogQueue implements ILogQueue { private static LogQueue mLogQueue = new LogQueue(); - protected Vector<ILogEventListener> mListeners = null; + protected Vector<ILogEventListener> mListeners = new Vector<ILogEventListener>(); /** * Constructs a log queue. @@ -52,7 +52,7 @@ public class LogQueue implements ILogQueue { * */ public void init() { - mListeners = new Vector<ILogEventListener>(); + mListeners.clear(); } @@ -61,8 +61,6 @@ public class LogQueue implements ILogQueue { * <P> */ public void shutdown() { - if (mListeners == null) - return; for (int i = 0; i < mListeners.size(); i++) { ILogEventListener listener = mListeners.elementAt(i); listener.shutdown(); @@ -96,8 +94,6 @@ public class LogQueue implements ILogQueue { * @param event the log event */ public void log(ILogEvent event) { - if (mListeners == null) - return; for (int i = 0; i < mListeners.size(); i++) { try { mListeners.elementAt(i).log(event); diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java index aa5714668..0fe3ac622 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -191,13 +191,6 @@ public class LogSubsystem implements ILogSubsystem { return mInstance; } - /** - * Retrieves LogQueue. - */ - public static ILogQueue getLogQueue() { - return mLogQueue; - } - public String getLogPluginName(ILogEventListener log) { IConfigStore cs = log.getConfigStore(); if (cs == null) { diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java b/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java index aec4caec7..c1c6e4af0 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java +++ b/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.logging.ILogger; public class Logger implements ILogger { protected static Logger mLogger = new Logger(); - protected ILogQueue mLogQueue = null; + protected ILogQueue mLogQueue = LogQueue.getLogQueue(); protected Hashtable<Integer, ILogEventFactory> mFactories = new Hashtable<Integer, ILogEventFactory>(); /** @@ -45,8 +45,6 @@ public class Logger implements ILogger { * of resident event factories. */ public Logger() { - mLogQueue = LogSubsystem.getLogQueue(); - // register standard event factories register(EV_AUDIT, new AuditEventFactory()); register(EV_SYSTEM, new SystemEventFactory()); |