--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/15 11:00:48	2298
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/15 11:55:20	2299
@@ -34,19 +34,25 @@
        
 
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-//long start1 = System.currentTimeMillis();
+
 		AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
-		request.setCharacterEncoding("UTF-8");
+		if (search == null) {
+			response.setContentType("text/xml; charset=UTF-8");
+			response.getWriter().print( 
+					"<status>error</status>" + 
+					"<error>Service not ready</error>"
+					);
+			return;
+			
+		}
 		
 		String brugerid = request.getParameter("brugerid");
 		String postnr = request.getParameter("postnr");
 		//String adresseStr = getUtf8( request.getParameter("adresse") );
 		String adresseStr = request.getParameter("adresse");
 
-//long start2 = System.currentTimeMillis();
 		SearchResult result = search.search(postnr, adresseStr);
 		
-//long start3 = System.currentTimeMillis();
 		
 		StringBuilder sb = new StringBuilder();
 		sb.append("<result>\n");
@@ -81,13 +87,6 @@
 		
 		response.setContentType("text/xml; charset=UTF-8");
 		response.getWriter().print( sb );
-	
-/*
-long start4 = System.currentTimeMillis();		
-System.out.println("Servlet2:" + (start2-start1) );
-System.out.println("Servlet3:" + (start3-start1) );
-System.out.println("Servlet4:" + (start4-start1) );
-*/
 		
 	}