svn commit: rev 56667 - in cocoon/branches/BRANCH_2_1_X/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:33 2004
New Revision: 56667

Modified:
   
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
   
cocoon/branches/BRANCH_2_1_X/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/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
==============================================================================
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
     (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
     Fri Nov  5 06:25:33 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/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
==============================================================================
--- 
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
   (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
   Fri Nov  5 06:25:33 2004
@@ -19,6 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.util.Iterator;
 import java.util.Map;
@@ -497,7 +498,7 @@
     /**
      * A simple SourceValidity protecting callers from resets.
      */
-    private static final class SitemapSourceValidity implements SourceValidity 
{
+    public static final class SitemapSourceValidity implements SourceValidity, 
Serializable {
 
         private SourceValidity nested_validity = null;
 
@@ -505,7 +506,7 @@
             super();
         }
 
-        private void set(SourceValidity validity) {
+        void set(SourceValidity validity) {
             this.nested_validity = validity;
         }
 
@@ -520,5 +521,10 @@
                    this.nested_validity.isValid(validity):
                    SourceValidity.INVALID);
         }
+
+        public SourceValidity getNestedValidity() {
+            return this.nested_validity;
+        }
+
     }
 }