--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 08:37:30	2319
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 08:58:41	2320
@@ -41,8 +41,6 @@
 		
 		while (res.next()) {
 			
-
-			
 			Address a = new Address();
 			a.id = res.getInt(1);
 			a.vejnavn = vejnavnCache.getInstance( res.getString(2) );
@@ -52,7 +50,7 @@
 			a.vejkode = res.getInt(6);
 			a.postnr = res.getInt(7);
 			a.gadeid = res.getLong(8);
-			a.distributor = distributorCache.getInstance(res.getString(9));;
+			a.distributor = distributorCache.getInstance(res.getString(9));
 			a.dbkBane = res.getInt(10);
 			a.koreliste = korelisteCache.getInstance( res.getString(11) );
 			a.rute = ruteCache.getInstance( res.getString(12) );
@@ -97,19 +95,16 @@
 		
 		ResultSet res = stmt.executeQuery(sql);
 		
-		DeduplicateHelper<String> transportTyper = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> transportCache = new DeduplicateHelper<String>();
 		
 		List<ExtendedBean> list = new ArrayList<ExtendedBean>( 350000); //Initial capacity 350K
-		while (res.next()) {
-			
-			String dbTransport = res.getString(4);			
-			String transport = transportTyper.getInstance(dbTransport);
+		while (res.next()) {		
 			
 			ExtendedBean eb = new ExtendedBean();
 			eb.orgId = res.getInt(1);
 			eb.targetId = res.getInt(2);
 			eb.afstand = res.getDouble(3);
-			eb.transport = transport;
+			eb.transport = transportCache.getInstance(res.getString(4));
 						
 			list.add(eb);
 		}
@@ -133,16 +128,14 @@
 
 		Map<Integer,HundredePctBean> map = new HashMap<Integer,HundredePctBean>();
 		
-		DeduplicateHelper<String> distributorer = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
 		
 		while (res.next()) {
 			
-			String dbDistributor = res.getString(2);			
-			String distributor = distributorer.getInstance(dbDistributor);
 			
 			HundredePctBean bean = new HundredePctBean();
 			bean.postnr = res.getInt(1);
-			bean.distributor = distributor;
+			bean.distributor = distributorCache.getInstance(res.getString(2));
 			bean.rute = res.getString(3);
 			bean.koreliste = res.getString(4);
 			bean.dbkBane = res.getInt(5);