[jboss-svn-commits] JBL Code SVN: r11089 - in labs/shotoku/trunk: shotoku-base/src/java/org/jboss/shotoku/cache and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-04-18 10:25:44 -0400 (Wed, 18 Apr 2007)
New Revision: 11089

Modified:
   labs/shotoku/trunk/lib/jboss-blog/jboss-blog-common.jar
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuResourceWatcher.java
Log:
Preacutions

Modified: labs/shotoku/trunk/lib/jboss-blog/jboss-blog-common.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuResourceWatcher.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuResourceWatcher.java	2007-04-18 14:23:46 UTC (rev 11088)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuResourceWatcher.java	2007-04-18 14:25:44 UTC (rev 11089)
@@ -23,6 +23,7 @@
 
 import org.jboss.shotoku.ContentManager;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
+import org.apache.log4j.Logger;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentMap;
@@ -36,6 +37,8 @@
  * @author Adam Warski (adamw at aster.pl)
  */
 public abstract class ShotokuResourceWatcher<K, T> extends ShotokuCacheItem<K, T> {
+    private final static Logger log = Logger.getLogger(ShotokuResourceWatcher.class);
+
     private ConcurrentMap<K, ConcurrentMap<String, ResourceStatus>> allStatuses;
 
     private ConcurrentMap<String, ResourceStatus> getStatuses(K key) {
@@ -82,6 +85,11 @@
         Map<String, ChangeType> changes = new HashMap<String, ChangeType>();
 
         ContentManager cm = getContentManager(key);
+        if (cm == null) {
+            log.warn("Null content manager for key " + key + ".");
+            return;
+        }
+        
         for (String path : statuses.keySet()) {
             ResourceStatus nrs = new ResourceStatus(cm, path);
             ChangeType ct = statuses.get(path).compareTo(nrs);