[richfaces-svn-commits] JBoss Rich Faces SVN: r11620 - trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit.

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

Author: nbelaevski
Date: 2008-12-07 11:25:20 -0500 (Sun, 07 Dec 2008)
New Revision: 11620

Modified:
   trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxComponentRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-5248

Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxComponentRendererBase.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxComponentRendererBase.java	2008-12-07 16:19:36 UTC (rev 11619)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxComponentRendererBase.java	2008-12-07 16:25:20 UTC (rev 11620)
@@ -37,7 +37,7 @@
 //	private InternetResource ajaxScript = getResource("/com/exadel/vcp/framework/ajax/scripts/AJAX.js");
 	private static final String AJAX_SCRIPT = AjaxScript.class.getName();
 	
-	private InternetResource[] scripts = null;
+	private volatile InternetResource[] scripts = null;
 
 	/* (non-Javadoc)
 	 * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext)
@@ -63,16 +63,20 @@
 	protected  InternetResource[] getScripts() {
 		// Lazy create
 		if (scripts == null) {
-			InternetResource[] additionalScripts = getAdditionalScripts();
-			// Custom scripts
-			if (null != additionalScripts) {
-				scripts = new InternetResource[additionalScripts.length+1];
-				System.arraycopy(additionalScripts,0,scripts,1,additionalScripts.length);
-			} else {
-				scripts = new InternetResource[1];				
+			synchronized (this) {
+				if (scripts == null) {
+					InternetResource[] additionalScripts = getAdditionalScripts();
+					// Custom scripts
+					if (null != additionalScripts) {
+						scripts = new InternetResource[additionalScripts.length+1];
+						System.arraycopy(additionalScripts,0,scripts,1,additionalScripts.length);
+					} else {
+						scripts = new InternetResource[1];				
+					}
+					// Ajax script
+					scripts[0] = getResource(AJAX_SCRIPT);			
+				}
 			}
-			// Ajax script
-			scripts[0] = getResource(AJAX_SCRIPT);			
 		}
 
 		return scripts;