--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/ContextListener.java	2015/02/22 20:17:55	2336
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/ContextListener.java	2015/02/23 12:30:41	2337
@@ -1,7 +1,5 @@
 package dk.daoas.daoadresseservice;
 
-import java.sql.SQLException;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -14,27 +12,7 @@
 @WebListener
 public class ContextListener implements ServletContextListener {
 	
-	public static class DataLoader implements Runnable {
-		ServletContext ctxt;
-		public DataLoader(ServletContext ctxt) {
-			this.ctxt = ctxt;
-		}
-		
-
-		@Override
-		public void run() {
-	    	
-	    	AdressSearch search = new AdressSearch();
-	    	try {
-	    		search.buildSearchStructures();
-	    		ctxt.setAttribute("search", search);
-	    	} catch (SQLException e) {
-	    		System.out.println("Error loading data: " + e.getMessage());
-	    	}
-		}
-		
 
-	}
 
 
     public ContextListener() {
@@ -49,9 +27,11 @@
     	System.out.println("Starting DAO Context");
     	
     	ServletContext ctxt = ctxtEvt.getServletContext();
+    	DataLoader load = new DataLoader(ctxt);    	
+    	ctxt.setAttribute("dataloader", load);
+    	load.doLoad();
+    	
     	
-    	Thread t = new Thread( new DataLoader(ctxt), "SearchDataLoader");
-    	t.start();    	
     	
     	System.out.println("DAO Context done");
     }