cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r523391 - /cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
Date Wed, 28 Mar 2007 16:16:05 GMT
Author: reinhard
Date: Wed Mar 28 09:16:04 2007
New Revision: 523391

URL: http://svn.apache.org/viewvc?view=rev&rev=523391
Log:
really use the provided configuration
(Actually the CachingSourceFactory is an intersting 
 candidate for moving its configuration to Spring. This
 would have the benefit of failing at startup when there
 is some configuration problem.)

Modified:
    cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java

Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java?view=diff&rev=523391&r1=523390&r2=523391
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
(original)
+++ cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
Wed Mar 28 09:16:04 2007
@@ -364,14 +364,6 @@
     throws SourceException {
 
         CachingSource source;
-        
-        CachingSourceValidityStrategy validityStrategy;
-        if(this.eventAware) {
-            validityStrategy = new EventAwareCachingSourceValidityStrategy();
-        } else {
-            validityStrategy = new ExpiresCachingSourceValidityStrategy();
-            
-        }
 
         if (wrappedSource instanceof TraversableSource) {
             if (wrappedSource instanceof InspectableSource) {
@@ -383,7 +375,7 @@
                                                                  expires,
                                                                  cacheName,
                                                                  isAsync(),
-                                                                 validityStrategy,
+                                                                 this.validityStrategy,
                                                                  fail);
             } else {
                 source = new TraversableCachingSource(this,
@@ -394,7 +386,7 @@
                                                       expires,
                                                       cacheName,
                                                       isAsync(),
-                                                      validityStrategy,
+                                                      this.validityStrategy,
                                                       fail);
             }
         } else {
@@ -405,7 +397,7 @@
                                        expires,
                                        cacheName,
                                        isAsync(),
-                                       validityStrategy,
+                                       this.validityStrategy,
                                        fail);
         }
 



Mime
View raw message