Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -rf03b912fdb712eca92251db637025a772a6c7490
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision f03b912fdb712eca92251db637025a772a6c7490)
@@ -53,6 +53,7 @@
 	public static final String PARAM_MIN_UPLOAD = "minUpload";
 	public static final String ATTR_LIMIT_UPLOAD = "limitUpload";
 	public static final String ATTR_LIMIT_UPLOAD_NUMBER = "limitUploadNumber";
+	public static final Object ATTR_ARRIVE_LIMIT = "arriveLimit";
 
 }
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c -rf03b912fdb712eca92251db637025a772a6c7490
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision f03b912fdb712eca92251db637025a772a6c7490)
@@ -346,8 +346,7 @@
 		if(limitUpload &&  filesUploaded != null){
 			int limit = (Integer)sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER);
 			if(limit == filesUploaded.size()){
-				//lock upload: currently, use same lock with "FINISH_ON_LOCK"
-				sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, true);
+				sessionMap.put(SbmtConstants.ATTR_ARRIVE_LIMIT, true);
 			}
 			int limitUploadLeft = limit -  filesUploaded.size();
 			dto.setLimitUploadLeft(limitUploadLeft);
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c -rf03b912fdb712eca92251db637025a772a6c7490
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision f03b912fdb712eca92251db637025a772a6c7490)
@@ -175,7 +175,7 @@
 								<fmt:message key="label.learner.filePath" />
 							</td>
 							<td>
-								<html:file property="file" disabled="${sessionMap.finishLock}" size="40" tabindex="1" />
+								<html:file property="file" disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" size="40" tabindex="1" />
 							</td>
 						</tr>
 						<!--File Description row -->
@@ -184,12 +184,12 @@
 								<fmt:message key="label.learner.fileDescription" />
 							</td>
 							<td>
-								<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="description" disabled="${sessionMap.finishLock}" />
+								<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="description" disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
 							</td>
 						</tr>
 						<tr>
 							<td colspan="2" align="center">
-								<html:submit disabled="${sessionMap.finishLock}" styleClass="button">
+								<html:submit disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" styleClass="button">
 									<fmt:message key="label.learner.upload" />
 								</html:submit>
 								<c:choose>