myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1548942 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets: el/FaceletStateValueExpression.java impl/CacheELFaceletCacheImpl.java
Date Sat, 07 Dec 2013 16:58:57 GMT
Author: lu4242
Date: Sat Dec  7 16:58:57 2013
New Revision: 1548942

URL: http://svn.apache.org/r1548942
Log:
MYFACES-3831 - CacheELFaceletCacheImpl is not storing the compiled template (only when "alwaysRecompile"
is enabled)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/CacheELFaceletCacheImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java?rev=1548942&r1=1548941&r2=1548942&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
Sat Dec  7 16:58:57 2013
@@ -37,7 +37,7 @@ import org.apache.myfaces.view.facelets.
  *
  */
 public class FaceletStateValueExpression extends ValueExpression 
-    implements Externalizable, FacesWrapper<ValueExpression>, CacheableValueExpression
+    implements Externalizable, FacesWrapper<ValueExpression>
 {
     private String uniqueId;
     private String key;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/CacheELFaceletCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/CacheELFaceletCacheImpl.java?rev=1548942&r1=1548941&r2=1548942&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/CacheELFaceletCacheImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/CacheELFaceletCacheImpl.java
Sat Dec  7 16:58:57 2013
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -147,7 +146,7 @@ class CacheELFaceletCacheImpl extends Ab
             f = getMemberFactory().newInstance(url);
             if (_refreshPeriod != NO_CACHE_DELAY)
             {
-                Map<String, FaceletNode> newLoc = new HashMap<String, FaceletNode>(_facelets);
+                //Map<String, FaceletNode> newLoc = new HashMap<String, FaceletNode>(_facelets);
                 if (!paramsSet.isEmpty()|| !knownParameters.isEmpty() )
                 {
                     paramsSet = new HashSet(paramsSet);
@@ -160,7 +159,7 @@ class CacheELFaceletCacheImpl extends Ab
                     //newLoc.put(key, new FaceletNode(f));
                     _facelets.put(key, new FaceletNode(f));
                 }
-                _facelets = newLoc;
+                //_facelets = newLoc;
             }
         }
 
@@ -338,4 +337,4 @@ class CacheELFaceletCacheImpl extends Ab
         }
         
     }
-}
\ No newline at end of file
+}



Mime
View raw message