Author: jalkanen
Date: Sat Jun 14 05:30:29 2008
New Revision: 667786
URL: http://svn.apache.org/viewvc?rev=667786&view=rev
Log:
JSPWIKI-185: No more NPEs.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java?rev=667786&r1=667785&r2=667786&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java Sat Jun 14
05:30:29 2008
@@ -54,7 +54,7 @@
private boolean m_enabled = true;
private WikiEngine m_engine;
- private static Logger log = Logger.getLogger(WatchDog.class.getName());
+ private Logger log = Logger.getLogger(WatchDog.class.getName());
private static HashMap<Integer,WeakReference<WatchDog>> c_kennel =
new HashMap<Integer,WeakReference<WatchDog>>();
@@ -372,6 +372,8 @@
*/
public void backgroundTask() throws Exception
{
+ if( c_kennel == null ) return;
+
synchronized( c_kennel )
{
for( Iterator i = c_kennel.entrySet().iterator(); i.hasNext();
)
