From ff85d8f91c000a6f4185b4d6b5ecd7d766adf932 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 13 Jul 2010 15:42:26 +0000
Subject: [PATCH] NIHVIVO-161 - Bug fix: on exit, distinguish between relative
 URLs and absolute URLs.

---
 .../controller/freemarker/ImageUploadController.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
index 13fca626e..9c4627dc9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
@@ -200,7 +200,14 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 	 */
 	private void doForward(HttpServletRequest req, HttpServletResponse resp,
 			ResponseValues values) throws ServletException, IOException {
-		req.getRequestDispatcher(values.getForwardUrl()).forward(req, resp);
+		String forwardUrl = values.getForwardUrl();
+		if (forwardUrl.contains("://")) {
+			// It's a full URL, so redirect.
+			resp.sendRedirect(forwardUrl);
+		} else {
+			// It's a relative URL, so forward within the application.
+			req.getRequestDispatcher(forwardUrl).forward(req, resp);
+		}
 	}
 
 	/**