svn commit: rev 56668 - in cocoon/trunk/src: blocks/eventcache/java/org/apache/cocoon/caching/impl java/org/apache/cocoon/components/source/impl

[unico]

Author: unico
Date: Fri Nov  5 06:25:55 2004
New Revision: 56668

Modified:
   
cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
   
cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Log:
fix bug with new SitemapSourceValidity and eventcaching where no events
for pipelines that use nested pipelines are registered.

Modified: 
cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
==============================================================================
--- 
cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
     (original)
+++ 
cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
     Fri Nov  5 06:25:55 2004
@@ -27,6 +27,7 @@
 import org.apache.cocoon.caching.EventRegistry;
 import org.apache.cocoon.caching.validity.Event;
 import org.apache.cocoon.caching.validity.EventValidity;
+import org.apache.cocoon.components.source.impl.SitemapSource;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.source.impl.validity.AbstractAggregatedValidity;
 
@@ -174,6 +175,8 @@
             handleAggregatedValidity((AbstractAggregatedValidity)val, key);
         } else if (val instanceof EventValidity) {
             handleEventValidity((EventValidity)val, key);
+        } else if (val instanceof SitemapSource.SitemapSourceValidity) {
+            examineValidity(((SitemapSource.SitemapSourceValidity) 
val).getNestedValidity(), key);
         }
     }
 

Modified: 
cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
==============================================================================
--- 
cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
   (original)
+++ 
cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
   Fri Nov  5 06:25:55 2004
@@ -431,7 +431,7 @@
     /**
      * A simple SourceValidity protecting callers from resets.
      */
-    private static final class SitemapSourceValidity implements SourceValidity 
{
+    public static final class SitemapSourceValidity implements SourceValidity {
 
         private SourceValidity nested_validity = null;
 
@@ -453,6 +453,10 @@
             return(this.nested_validity != null?
                    this.nested_validity.isValid(validity):
                    SourceValidity.INVALID);
+        }
+        
+        public SourceValidity getNestedValidity() {
+            return this.nested_validity;
         }
     }
 }