[MMBASE SCM] r39701 - mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util

[michiel]

Author: michiel
Date: 2009-11-16 10:20:30 +0100 (Mon, 16 Nov 2009)
New Revision: 39701

Modified:
   
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
Log:
avoid NPE

Modified: 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
===================================================================
--- 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
  2009-11-16 08:52:02 UTC (rev 39700)
+++ 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
  2009-11-16 09:20:30 UTC (rev 39701)
@@ -105,7 +105,7 @@
             originalPageContextValues = new HashMap<String, Object>();
             pageContext.setAttribute(PAGECONTEXT_KEY + uniqueNumber, 
originalPageContextValues);
         }
-        if (! origPageContext.equals(pageContext)) {
+        if (pageContext != null && ! pageContext.equals(origPageContext)) {
             for (Map.Entry<String, Object> entry : b.entrySet()) {
                 mirrorPut(entry.getKey(), entry.getValue());
             }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs