You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/03/03 12:37:52 UTC

svn commit: r382766 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingAddResource.java

Author: imario
Date: Fri Mar  3 03:37:50 2006
New Revision: 382766

URL: http://svn.apache.org/viewcvs?rev=382766&view=rev
Log:
ensure to render resources only once

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingAddResource.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingAddResource.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingAddResource.java?rev=382766&r1=382765&r2=382766&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingAddResource.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingAddResource.java Fri Mar  3 03:37:50 2006
@@ -22,6 +22,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
@@ -97,6 +99,11 @@
 	 */
 	private final Thread cleanupThread;
 
+	/**
+	 * helper to determines if the resource has already been added
+	 */
+	private Set alreadySeenResources = new TreeSet();
+
     private static final String PATH_SEPARATOR = "/";
 
     protected static final Log log = LogFactory.getLog(StreamingAddResource.class);
@@ -426,6 +433,10 @@
             boolean defer)
     {
     	WritablePositionedInfo info = (WritablePositionedInfo) getScriptInstance(context, uri, defer);
+    	if (checkAlreadyAdded(info))
+    	{
+    		return;
+    	}
     	HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
     	try
 		{
@@ -452,6 +463,10 @@
     {
         validateResourceHandler(resourceHandler);
     	WritablePositionedInfo info = (WritablePositionedInfo) getScriptInstance(context, resourceHandler, defer);
+    	if (checkAlreadyAdded(info))
+    	{
+    		return;
+    	}
     	HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
     	try
 		{
@@ -463,7 +478,19 @@
 		}
     }
 
-    /**
+    private boolean checkAlreadyAdded(PositionedInfo info)
+	{
+    	Long key = new Long(info.hashCode());
+    	if (alreadySeenResources.contains(key))
+    	{
+    		return true;
+    	}
+    	
+    	alreadySeenResources.add(key);
+		return false;
+	}
+
+	/**
      * Adds the given Style Sheet at the specified document position.
      * If the style sheet has already been referenced, it's added only once.
      */
@@ -505,6 +532,10 @@
 
 	private void addStyleSheet(FacesContext context, StreamablePositionedInfo styleInstance)
 	{
+    	if (checkAlreadyAdded(styleInstance))
+    	{
+    		return;
+    	}
     	headerInfoEntry.addInfo(styleInstance);
 	}
 
@@ -534,6 +565,10 @@
             String inlineScript)
     {
     	WritablePositionedInfo info = (WritablePositionedInfo) getInlineScriptInstance(inlineScript);
+    	if (checkAlreadyAdded(info))
+    	{
+    		return;
+    	}
     	HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
     	try
 		{