ZK-5150: uploading issue

zkoss · May 27, 2022 · 92a29aa · 92a29aa
1 parent 59a5da6
commit 92a29aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/zk/src/org/zkoss/zk/au/http/AuDropUploader.java b/zk/src/org/zkoss/zk/au/http/AuDropUploader.java
@@ -98,7 +98,7 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 		}
 
 		final Map<String, String> attrs = new HashMap<String, String>();
-		String alert = null, uuid = null, dtid = null, nextURI = null;
+		String alert = null, uuid = null, dtid = null;
 		Desktop desktop = null;
 		try {
 			if (Strings.isEmpty(uuid = fetchParameter(request, "uuid", attrs)))
@@ -110,7 +110,6 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 			if (alert == null) {
 				desktop = ((WebAppCtrl) sess.getWebApp()).getDesktopCache(sess).getDesktop(dtid);
 				final Map<String, Object> params = parseRequest(request, desktop, "");
-				nextURI = (String) params.get("nextURI");
 				processItems(desktop, params, attrs);
 			}
 		} catch (Throwable ex) {
@@ -120,8 +119,6 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 				if (uuid != null)
 					attrs.put("uuid", uuid);
 			}
-			if (nextURI == null)
-				nextURI = request.getParameter("nextURI");
 
 			if (ex instanceof ComponentNotFoundException) {
 				alert = generateAlertMessage(MISSING_REQUIRED_COMPONENT, Messages.get(MZk.UPDATE_OBSOLETE_PAGE, uuid));

diff --git a/zk/src/org/zkoss/zk/au/http/AuUploader.java b/zk/src/org/zkoss/zk/au/http/AuUploader.java
@@ -109,7 +109,7 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 		}
 
 		final Map<String, String> attrs = new HashMap<String, String>();
-		String alert = null, uuid = null, nextURI = null, sid = null;
+		String alert = null, uuid = null, sid = null;
 		Desktop desktop = null;
 		try {
 			if (!isMultipartContent(request)) {
@@ -162,7 +162,6 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 					} else {
 						desktop = ((WebAppCtrl) sess.getWebApp()).getDesktopCache(sess).getDesktop(dtid);
 						final Map<String, Object> params = parseRequest(request, desktop, uuid + '_' + sid);
-						nextURI = (String) params.get("nextURI");
 
 						processItems(desktop, params, attrs);
 					}
@@ -174,8 +173,6 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 				if (uuid != null)
 					attrs.put("uuid", uuid);
 			}
-			if (nextURI == null)
-				nextURI = request.getParameter("nextURI");
 
 			if (ex instanceof ComponentNotFoundException) {
 				alert = generateAlertMessage(MISSING_REQUIRED_COMPONENT, Messages.get(MZk.UPDATE_OBSOLETE_PAGE, uuid));
@@ -213,9 +210,7 @@ public void service(HttpServletRequest request, HttpServletResponse response, St
 		if (log.isTraceEnabled())
 			log.trace(Objects.toString(attrs));
 
-		if (nextURI == null || nextURI.length() == 0)
-			nextURI = "~./zul/html/fileupload-done.html.dsp";
-		Servlets.forward(_ctx, request, response, nextURI, attrs, Servlets.PASS_THRU_ATTR);
+		Servlets.forward(_ctx, request, response, "~./zul/html/fileupload-done.html.dsp", attrs, Servlets.PASS_THRU_ATTR);
 	}
 
 	/** Handles the exception that was thrown when uploading files,

diff --git a/zkdoc/release-note b/zkdoc/release-note
@@ -2,6 +2,7 @@ ZK 9.5.1.4
 * Features
 
 * Bugs
+  ZK-5150: uploading issue
 
 * Upgrade Notes
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ ZK 9.5.1.4 @@
     * Features
     * Bugs
+      ZK-5150: uploading issue
     * Upgrade Notes
@@ Expand Down @@