svn commit: r514614 - in /lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source: RepositorySource.java RepositorySourceValidity.java

Author: andreas
Date: Mon Mar  5 01:14:29 2007
New Revision: 514614

URL: http://svn.apache.org/viewvc?view=rev&rev=514614
Log:
Use content source URI instead of node source URI for validity. This fixes bug 
41715. Thanks to Richard Frovarp for the patch.

Modified:
    
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
    
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java

Modified: 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java?view=diff&rev=514614&r1=514613&r2=514614
==============================================================================
--- 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java 
(original)
+++ 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java 
Mon Mar  5 01:14:29 2007
@@ -287,6 +287,13 @@
     }
 
     /**
+     *
+     */
+    public String getSourceURI() {
+        return getContent().getSourceURI();
+    }
+
+    /**
      * @see org.apache.excalibur.source.Source#getMimeType()
      */
     public String getMimeType() {

Modified: 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java?view=diff&rev=514614&r1=514613&r2=514614
==============================================================================
--- 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
 (original)
+++ 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
 Mon Mar  5 01:14:29 2007
@@ -34,12 +34,8 @@
      * @param source The source this validity is for.
      */
     public RepositorySourceValidity(RepositorySource source) {
-        this.sourceUri = source.getNode().getSourceURI();
-        try {
-            this.lastModified = source.getNode().getLastModified();
-        } catch (RepositoryException e) {
-            throw new RuntimeException(e);
-        }
+        this.sourceUri = source.getSourceURI();
+        this.lastModified = source.getLastModified();
     }
 
     public int isValid() {