svn commit: r1059368 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Jan 15 16:38:09 2011
New Revision: 1059368

URL: http://svn.apache.org/viewvc?rev=1059368&view=rev
Log:
fixed NPE when reloading updated markup in development mode
Issue: WICKET-3336

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=1059368&r1=1059367&r2=1059368&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
 Sat Jan 15 16:38:09 2011
@@ -96,18 +96,27 @@ public class MarkupCache implements IMar
                }
        }
 
+       /**
+        * {@inheritDoc}
+        */
        public void clear()
        {
                markupCache.clear();
                markupKeyCache.clear();
        }
 
+       /**
+        * {@inheritDoc}
+        */
        public void shutdown()
        {
                markupCache.shutdown();
                markupKeyCache.shutdown();
        }
 
+       /**
+        * {@inheritDoc}
+        */
        public final IMarkupFragment removeMarkup(final String cacheKey)
        {
                Args.notNull(cacheKey, "cacheKey");
@@ -188,6 +197,10 @@ public class MarkupCache implements IMar
        {
                // Get the markup associated with key
                Markup markup = markupCache.get(key);
+               if (markup == null)
+               {
+                       return false;
+               }
 
                // Get the base markup resource stream from the markup
                MarkupResourceStream resourceStream = 
markup.getMarkupResourceStream()
@@ -215,6 +228,9 @@ public class MarkupCache implements IMar
                return false;
        }
 
+       /**
+        * {@inheritDoc}
+        */
        public final int size()
        {
                return markupCache.size();
@@ -610,11 +626,17 @@ public class MarkupCache implements IMar
                {
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public void clear()
                {
                        cache.clear();
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public boolean containsKey(Object key)
                {
                        if (key == null)
@@ -624,6 +646,9 @@ public class MarkupCache implements IMar
                        return cache.containsKey(key);
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public V get(Object key)
                {
                        if (key == null)
@@ -633,26 +658,41 @@ public class MarkupCache implements IMar
                        return cache.get(key);
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public Collection<K> getKeys()
                {
                        return cache.keySet();
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public void put(K key, V value)
                {
                        cache.put(key, value);
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public boolean remove(K key)
                {
                        return cache.remove(key) == null;
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public int size()
                {
                        return cache.size();
                }
 
+               /**
+                * {@inheritDoc}
+                */
                public void shutdown()
                {
                        clear();