You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2011/04/04 19:02:38 UTC
svn commit: r1088685 - in
/myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
share/io/URLInputStreamProvider.java skin/SkinUtils.java
Author: jwaldman
Date: Mon Apr 4 17:02:38 2011
New Revision: 1088685
URL: http://svn.apache.org/viewvc?rev=1088685&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/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java
myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
Modified: myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java?rev=1088685&r1=1088684&r2=1088685&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java (original)
+++ myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java Mon Apr 4 17:02:38 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/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java?rev=1088685&r1=1088684&r2=1088685&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java (original)
+++ myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java Mon Apr 4 17:02:38 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;
@@ -726,7 +730,15 @@ public class SkinUtils
else
{
_LOG.finest("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.