forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r447342 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
Date Mon, 18 Sep 2006 09:41:46 GMT
Author: thorsten
Date: Mon Sep 18 02:41:45 2006
New Revision: 447342

URL: http://svn.apache.org/viewvc?view=rev&rev=447342
Log:
FOR-931
Since we are still using the non cached jx generator we need to make sure that the validity
is not null.
Thanks to the forrestBot which spotted this (and thanks to David who has set it up).

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java?view=diff&rev=447342&r1=447341&r2=447342
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
Mon Sep 18 02:41:45 2006
@@ -685,7 +685,7 @@
                     // Adding the contract to the validity object.
                     // As soon the contract changes we want a rebuild of 
                     // the page and not the cached object.
-                    if(!validityOverride.equals(CACHING_OFF)) {
+                    if(!validityOverride.equals(CACHING_OFF)&null!=this.validity) {
                         SourceValidity contractValidityId = m_resolver.resolveURI(contractUri).getValidity();
 //                      we cannot allow null in an AggregatedValidity
                         if (null!=contractValidityId)
@@ -720,7 +720,7 @@
                     // Adding the raw data to the validity object.
                     // As soon the raw data changes we want a rebuild of 
                     // the page and not the cached object.
-                    if(!validityOverride.equals(CACHING_OFF)) {
+                    if(!validityOverride.equals(CACHING_OFF)&null!=this.validity) {
                         SourceValidity contractValidityRaw = m_resolver.resolveURI(value).getValidity();
                         // we cannot allow null in an AggregatedValidity
                         if(null!=contractValidityRaw)



Mime
View raw message