[richfaces-svn-commits] JBoss Rich Faces SVN: r11622 - trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2008-12-07 11:49:46 -0500 (Sun, 07 Dec 2008)
New Revision: 11622

Modified:
   trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java
   trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-5248

Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java	2008-12-07 16:39:51 UTC (rev 11621)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java	2008-12-07 16:49:46 UTC (rev 11622)
@@ -229,10 +229,13 @@
      * @see org.ajax4jsf.renderkit.HeaderResourcesRendererBase#getScripts()
      */
     protected InternetResource[] getScripts() {
-    	if (scripts == null) {			
-			scripts = new InternetResource[1];				
-			scripts[0] = getResource(FORM_SCRIPT);			
+    	synchronized (this) {
+        	if (scripts == null) {			
+    			scripts = new InternetResource[1];				
+    			scripts[0] = getResource(FORM_SCRIPT);			
+    		}
 		}
-		return scripts;
+
+    	return scripts;
 	}
 }

Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java	2008-12-07 16:39:51 UTC (rev 11621)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java	2008-12-07 16:49:46 UTC (rev 11622)
@@ -70,21 +70,13 @@
 		"timeout"
 	};
 	
-	private volatile InternetResource[] scripts;
+	private InternetResource[] scripts = new InternetResource[] {
+		getResource(AjaxScript.class.getName()),
+		getResource(QueueScript.class.getName())
+	};
 	
 	@Override
 	protected InternetResource[] getScripts() {
-		if (scripts == null) {
-			synchronized (this) {
-				if (scripts == null) {
-					scripts = new InternetResource[] {
-						getResource(AjaxScript.class.getName()),
-						getResource(QueueScript.class.getName())
-					};
-				}
-			}
-		}
-		
 		return scripts;
 	}