huber 2002/12/22 09:02:17
Modified: . changes.xml
src/java/org/apache/cocoon/components/modules/input
XMLFileModule.java
Log:
XMLFileModule checks result of SitemapSource.getValidity() as it may return null
PR:15609
Obtained from: [EMAIL PROTECTED]
Submitted by:[EMAIL PROTECTED]
Revision Changes Path
1.319 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- changes.xml 22 Dec 2002 08:13:29 -0000 1.318
+++ changes.xml 22 Dec 2002 17:02:17 -0000 1.319
@@ -40,6 +40,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="BH" type="fix" due-to-email="[EMAIL PROTECTED]"
+ due-to="Jeff Turner" fixes-bug="15609">
+ XMLFileModule checks result of SitemapSource.getValidity() as it may return null
+ </action>
<action dev="DC" type="add">
Integrated the validation targets into the build ("validate-config" and
"validate-xdocs") also still available at the command-line. Validation
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
Index: XMLFileModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLFileModule.java 17 Dec 2002 14:53:16 -0000 1.3
+++ XMLFileModule.java 22 Dec 2002 17:02:17 -0000 1.4
@@ -163,7 +163,7 @@
logger.debug("document cached... checking validity of uri
"+this.uri);
src = resolver.resolveURI(this.uri);
valid = src.getValidity();
- if (!this.srcVal.isValid(valid)) {
+ if (srcVal != null && !this.srcVal.isValid(valid)) {
if (logger.isDebugEnabled())
logger.debug("reloading document... uri "+this.uri);
this.srcVal = valid;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
