--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 08:27:13	2318
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 08:37:30	2319
@@ -33,34 +33,29 @@
 		
 		List<Address> list = new ArrayList<Address>(2600000);//initial capacity 2.6 mio
 		
-		DeduplicateHelper<String> vejnavne = new DeduplicateHelper<String>();
-		DeduplicateHelper<String> distributorer = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> vejnavnCache = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> korelisteCache = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
 
 		
 		while (res.next()) {
 			
-			// Cache String instanserne for vejnavne for at mindske hukommelses forbruget
-			String dbVejnavn = res.getString(2);			
-			String vejnavn = vejnavne.getInstance(dbVejnavn);
 
-			// Cache String instanserne for distributor for at mindske hukommelses forbruget
-			// (De-dubblicate)
-			String dbDistributor = res.getString(9);			
-			String distributor = distributorer.getInstance(dbDistributor);
 			
 			Address a = new Address();
 			a.id = res.getInt(1);
-			a.vejnavn = vejnavn;
+			a.vejnavn = vejnavnCache.getInstance( res.getString(2) );
 			a.husnr = res.getInt(3);
 			a.husnrbogstav = res.getString(4);
 			a.kommunekode = res.getInt(5);
 			a.vejkode = res.getInt(6);
 			a.postnr = res.getInt(7);
 			a.gadeid = res.getLong(8);
-			a.distributor = distributor;
+			a.distributor = distributorCache.getInstance(res.getString(9));;
 			a.dbkBane = res.getInt(10);
-			a.koreliste = res.getString(11);
-			a.rute = res.getString(12);
+			a.koreliste = korelisteCache.getInstance( res.getString(11) );
+			a.rute = ruteCache.getInstance( res.getString(12) );
 			
 			//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);