bloritsch 01/05/04 08:06:59
Modified: src/org/apache/cocoon/caching Tag: xml-cocoon2
CompositeCacheValidity.java
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractServerPage.java
Log:
Fix for NullPointerException
Revision Changes Path
No revision
No revision
1.1.2.2 +2 -2
xml-cocoon/src/org/apache/cocoon/caching/Attic/CompositeCacheValidity.java
Index: CompositeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/caching/Attic/CompositeCacheValidity.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CompositeCacheValidity.java 2001/04/17 18:18:24 1.1.2.1
+++ CompositeCacheValidity.java 2001/05/04 15:06:23 1.1.2.2
@@ -13,7 +13,7 @@
* A validation object using a Hashmap.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/17 18:18:24 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/05/04 15:06:23 $
*/
public final class CompositeCacheValidity
implements CacheValidity {
@@ -28,7 +28,7 @@
public boolean isValid(CacheValidity validity) {
if (validity instanceof CompositeCacheValidity) {
- return
(v1.isValid(((CompositeCacheValidity)validity).getValidity1()) &&
+ return
(v1.isValid(((CompositeCacheValidity)validity).getValidity1()) &&
v2.isValid(((CompositeCacheValidity)validity).getValidity2()));
}
return false;
No revision
No revision
1.1.2.22 +10 -1
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- XSPGenerator.java 2001/04/30 14:17:09 1.1.2.21
+++ XSPGenerator.java 2001/05/04 15:06:42 1.1.2.22
@@ -13,6 +13,8 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.generator.CompiledComponent;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.TimeStampCacheValidity;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.generation.AbstractServerPage;
import org.apache.avalon.excalibur.pool.Poolable;
@@ -21,7 +23,7 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/30 14:17:09 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/05/04 15:06:42 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Poolable {
@@ -37,5 +39,12 @@
*/
public void compose(ComponentManager manager) {
super.compose(manager);
+ }
+
+ /**
+ * Generate the Validity of this type of serverpage.
+ */
+ public CacheValidity generateValidity() {
+ return new TimeStampCacheValidity(this.dateCreated);
}
}
No revision
No revision
1.1.2.10 +6 -5
xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- AbstractServerPage.java 2001/05/04 13:37:58 1.1.2.9
+++ AbstractServerPage.java 2001/05/04 15:06:52 1.1.2.10
@@ -10,6 +10,7 @@
import java.io.File;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.NOPCacheValidity;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.environment.Request;
import org.xml.sax.SAXException;
@@ -20,7 +21,7 @@
* declares variables that must be explicitly initialized by code generators.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/05/04 13:37:58 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/05/04 15:06:52 $
*/
public abstract class AbstractServerPage
extends ServletGenerator implements CompiledComponent, Cacheable
@@ -92,12 +93,12 @@
/**
* Generate the validity object.
- *
- * @return The generated validity object or <code>null</code> if the
- * component is currently not cachable.
+ *
+ * @return The generated validity object, <code>NOPCacheValidity</code>
+ * is the default.
*/
public CacheValidity generateValidity() {
- return null;
+ return new NOPCacheValidity();
}
// FIXME: Add more methods!
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
