svn commit: r1082589 - in /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: share/io/URLInputStreamProvider.java skin/SkinUtils.java

[jw...@apache.org]

Author: jwaldman
Date: Thu Mar 17 16:50:54 2011
New Revision: 1082589

URL: http://svn.apache.org/viewvc?rev=1082589&view=rev
Log:
TRINIDAD-2066 do not cache url connections for trinidad-skins.xml or for skinning's css files in design time mode

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java?rev=1082589&r1=1082588&r2=1082589&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java Thu Mar 17 16:50:54 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.myfaces.trinidadinternal.share.io;
 
+import java.beans.Beans;
+
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.IOException;
@@ -53,6 +55,11 @@ public class URLInputStreamProvider impl
     // to URL.openConnection
     _lastModifiedTime = URLUtils.getLastModified(_url);
     URLConnection connection = _url.openConnection();
+    // prevent caching during DT where the source may change...
+    if (Beans.isDesignTime())
+    {
+      connection.setUseCaches(false);
+    }
     // In theory, should not need to close
     InputStream base = connection.getInputStream();
     

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java?rev=1082589&r1=1082588&r2=1082589&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java Thu Mar 17 16:50:54 2011
@@ -18,12 +18,16 @@
  */
 package org.apache.myfaces.trinidadinternal.skin;
 
+import java.beans.Beans;
+
 import java.io.IOException;
 
 import java.io.InputStream;
 
 import java.net.URL;
 
+import java.net.URLConnection;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -979,7 +983,14 @@ public class SkinUtils
     else
     {
       if (_LOG.isFine()) _LOG.fine("Processing skin URL:{0}", url);
-      InputStream in = url.openStream();
+      
+      URLConnection urlConnection = url.openConnection();
+      // prevent caching during DT where the source may change...
+      if (Beans.isDesignTime())
+      {
+        urlConnection.setUseCaches(false);
+      }
+      InputStream in = urlConnection.getInputStream();
       try
       {
         // parse the config file and register the skin's additional stylesheets.