From 496d04243e45ad5c273ad0ba158e9acf00f28aa0 Mon Sep 17 00:00:00 2001
From: briancaruso <briancaruso@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 19 Jun 2012 17:12:00 +0000
Subject: [PATCH] Changing startup status to use requested url for continue
 link.

---
 .../filters/StartupStatusDisplayFilter.java       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
index 0c8b237c8..a5f416e3e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
@@ -78,13 +78,20 @@ public class StartupStatusDisplayFilter implements Filter {
 			bodyMap.put("contextPath", getContextPath());
 			bodyMap.put("applicationName", getApplicationName());			
 						
-	        HttpServletRequest httpreq = (HttpServletRequest) req;        
+	        HttpServletRequest httpreq = (HttpServletRequest) req;
+	        String url = "";
+	        
 	        String path = httpreq.getRequestURI();
+	        if( path != null ){
+	        	url = path;
+	        }
+	        
 	        String query = httpreq.getQueryString();
 	        if( !StringUtils.isEmpty( query )){
-	        	query = "?" + query;
-	        }	        
-			bodyMap.put("url", path+query );
+	        	url = url + "?" + query;
+	        }	
+	        
+			bodyMap.put("url", url );
 			
 			hResp.setStatus(SC_INTERNAL_SERVER_ERROR);
 			Template tpl = loadFreemarkerTemplate();