Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java,v
diff -u -r1.25 -r1.26
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	22 Sep 2016 14:39:27 -0000	1.25
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	15 Dec 2016 15:52:50 -0000	1.26
@@ -125,21 +125,6 @@
 
     public static String getRequestURL(HttpServletRequest request) throws ServletException, UnsupportedEncodingException {
 
-	// get the location from an explicit parameter if it exists
-	String redirectUrlParam = request.getParameter("redirectURL");
-	log.info("LoginRequestDispatcher1 " + request.getParameter("redirectURL"));
-	if (redirectUrlParam != null) {
-	    // for NTU Blackboard's based templates, force to https to co-exist with Blackboard
-	    if (redirectUrlParam.indexOf("ldtemplate") >= 0) {
-		log.info("LoginRequestDispatcher23 " + request.getParameter("redirectURL"));
-		return "https://" + request.getServerName() + request.getContextPath() + "/" + redirectUrlParam;
-	    } else {
-		log.info("LoginRequestDispatcher2 " + request.getContextPath() + URL_REDIRECT + "&redirectURL=" + URLEncoder.encode(redirectUrlParam, "UTF8"));
-		return request.getContextPath() + URL_REDIRECT + "&redirectURL=" + URLEncoder.encode(redirectUrlParam, "UTF8");
-	    }
-	}
-	log.info("LoginRequestDispatcher3 " + request.getParameter("redirectURL"));
-
 	String method = request.getParameter(PARAM_METHOD);
 	String lessonId = request.getParameter(PARAM_LESSON_ID);
 	String mode = request.getParameter(PARAM_MODE);
@@ -154,6 +139,17 @@
 	    }
 	}
 
+	// get the location from an explicit parameter if it exists
+	String redirectUrlParam = request.getParameter("redirectURL");
+	if (redirectUrlParam != null) {
+	    // for NTU Blackboard's based templates, force to https to co-exist with Blackboard
+	    if (redirectUrlParam.indexOf("ldtemplate") >= 0) {
+		return "https://" + request.getServerName() + request.getContextPath() + "/" + redirectUrlParam;
+	    } else {
+		return request.getContextPath() + URL_REDIRECT + "&redirectURL=" + URLEncoder.encode(redirectUrlParam, "UTF8");
+	    }
+	}
+
 	if (MODE_GRADEBOOK.equals(mode)) {
 	    return request.getContextPath() + URL_GRADEBOOK + request.getQueryString();
 	}