camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1222319 - in /camel/branches/camel-2.8.x: ./ components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java
Date Thu, 22 Dec 2011 16:15:06 GMT
Author: dkulp
Date: Thu Dec 22 16:15:05 2011
New Revision: 1222319

URL: http://svn.apache.org/viewvc?rev=1222319&view=rev
Log:
Merged revisions 1209475 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1209475 | ningjiang | 2011-12-02 08:38:20 -0500 (Fri, 02 Dec 2011) | 1 line
  
  CAMEL-4732 updated the cached time value of the test
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java?rev=1222319&r1=1222318&r2=1222319&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java
Thu Dec 22 16:15:05 2011
@@ -92,7 +92,7 @@ public class FreemarkerContentCacheTest 
         mock.assertIsSatisfied();
 
         // now change content in the file in the classpath and try again .... after delaying
longer than the cache update delay
-        Thread.sleep(5000);
+        Thread.sleep(2000);
         template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?fileExist=Override",
"Bye ${headers.name}", Exchange.FILE_NAME, "hello.ftl");
 
         mock.reset();
@@ -110,7 +110,7 @@ public class FreemarkerContentCacheTest 
 
                 from("direct:b").to("freemarker://org/apache/camel/component/freemarker/hello.ftl?contentCache=true").to("mock:result");
                 
-                from("direct:c").to("freemarker://org/apache/camel/component/freemarker/hello.ftl?contentCache=true&templateUpdateDelay=4").to("mock:result");
+                from("direct:c").to("freemarker://org/apache/camel/component/freemarker/hello.ftl?contentCache=true&templateUpdateDelay=1").to("mock:result");
             }
         };
     }



Mime
View raw message