You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/09/14 06:00:58 UTC

svn commit: r996752 - /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java

Author: lu4242
Date: Tue Sep 14 04:00:57 2010
New Revision: 996752

URL: http://svn.apache.org/viewvc?rev=996752&view=rev
Log:
MYFACES-2918 Resource implementations cannot be cached

Modified:
    myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java?rev=996752&r1=996751&r2=996752&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java Tue Sep 14 04:00:57 2010
@@ -25,7 +25,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.faces.application.ProjectStage;
-import javax.faces.application.Resource;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 
@@ -37,7 +36,7 @@ public class ResourceHandlerCache
             .getLogger(ResourceHandlerCache.class.getName());
 
     private Boolean _resourceCacheEnabled = null;
-    private Map<ResourceKey, Resource> _resourceCacheMap = null;
+    private Map<ResourceKey, ResourceValue> _resourceCacheMap = null;
 
     @JSFWebConfigParam(defaultValue = "500", since = "2.0.2")
     private static final String RESOURCE_HANDLER_CACHE_SIZE_ATTRIBUTE = "org.apache.myfaces.RESOURCE_HANDLER_CACHE_SIZE";
@@ -47,7 +46,7 @@ public class ResourceHandlerCache
     private static final String RESOURCE_HANDLER_CACHE_ENABLED_ATTRIBUTE = "org.apache.myfaces.RESOURCE_HANDLER_CACHE_ENABLED";
     private static final boolean RESOURCE_HANDLER_CACHE_ENABLED_DEFAULT = true;
 
-    public Resource getResource(String resourceName, String libraryName,
+    public ResourceValue getResource(String resourceName, String libraryName,
             String contentType)
     {
         if (!isResourceCachingEnabled() || _resourceCacheMap == null)
@@ -74,7 +73,7 @@ public class ResourceHandlerCache
     }
 
     public void putResource(String resourceName, String libraryName,
-            String contentType, Resource resource)
+            String contentType, ResourceMeta resource, ResourceLoader loader)
     {
         if (!isResourceCachingEnabled())
             return;
@@ -88,12 +87,12 @@ public class ResourceHandlerCache
             if (log.isLoggable(Level.FINE))
                 log.log(Level.FINE, "Initializing resource cache map");
             _resourceCacheMap = Collections
-                    .synchronizedMap(new _ResourceMap<ResourceKey, Resource>(
+                    .synchronizedMap(new _ResourceMap<ResourceKey, ResourceValue>(
                             getMaxSize()));
         }
 
         _resourceCacheMap.put(new ResourceKey(resourceName, libraryName,
-                contentType), resource);
+                contentType), new ResourceValue(resource, loader));
     }
 
     private boolean isResourceCachingEnabled()
@@ -200,6 +199,31 @@ public class ResourceHandlerCache
             return true;
         }
     }
+    
+    public static class ResourceValue
+    {
+        private ResourceMeta resourceMeta;
+        
+        private ResourceLoader resourceLoader;
+
+        public ResourceValue(ResourceMeta resourceMeta,
+                ResourceLoader resourceLoader)
+        {
+            super();
+            this.resourceMeta = resourceMeta;
+            this.resourceLoader = resourceLoader;
+        }
+
+        public ResourceMeta getResourceMeta()
+        {
+            return resourceMeta;
+        }
+
+        public ResourceLoader getResourceLoader()
+        {
+            return resourceLoader;
+        }
+    }
 
     private static class _ResourceMap<K, V> extends LinkedHashMap<K, V>
     {