[richfaces-svn-commits] JBoss Rich Faces SVN: r9064 - trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit.

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

Author: andrei_exadel
Date: 2008-06-17 03:58:28 -0400 (Tue, 17 Jun 2008)
New Revision: 9064

Modified:
   trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
Log:
RF-3675 

Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java	2008-06-16 20:53:40 UTC (rev 9063)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java	2008-06-17 07:58:28 UTC (rev 9064)
@@ -97,10 +97,15 @@
 		String fileUploadIndicator = requestParameterMap.get(Filter.FILE_UPLOAD_INDICATOR);
 
 		if (fileUploadIndicator != null && Boolean.TRUE.toString().equals(fileUploadIndicator)) {
+			UIFileUpload fileUpload = (UIFileUpload) component;
 			String clientId = component.getClientId(context);
-			UIFileUpload fileUpload = (UIFileUpload) component;
+			String id = requestParameterMap.get("id");
+			
+			if (!clientId.equals(id)) {
+				return; // Avoid listener calling for another fileUpload
+			}
+			
 			String uid = requestParameterMap.get(Filter.UPLOAD_FILES_ID);
-			String id = requestParameterMap.get("id");
 			decreaseFileCounter(context, id);
 			Map<String, MultipartRequest> map = (Map<String, MultipartRequest>) externalContext.getSessionMap()
 					.get(Filter.REQUESTS_SESSIONS_BEAN_NAME);