--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2016/01/19 11:50:30	2830
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2016/01/19 17:03:18	2831
@@ -36,8 +36,8 @@
 	private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid;	
 	private Map<Integer,  Map<Short, Map<String,Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra
 	
-
-	private List<Address> alleAdresser;
+	private List<Address> ikkeDaekkedeAdresser = new ArrayList<Address>(60000);
+	private List<Address> hundredePctAdresser = new ArrayList<Address>(120000);
 	
 	private Map<String,Integer> helperCache;
 	
@@ -316,7 +316,7 @@
 		long start1 = System.currentTimeMillis();
 		System.out.println("Build -- stage 1");
 		
-		alleAdresser = db.getAllAdresses();
+		List<Address> alleAdresser = db.getAllAdresses();
 		
 		
 		/* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/
@@ -539,14 +539,19 @@
 				stats.extendedCount++;
 				break;
 			case DAEKNING_100PCT:
+				hundredePctAdresser.add(addr);
 				stats.hundredePctCount++;
 				break;
 			default:
+				ikkeDaekkedeAdresser.add(addr);
 				stats.ikkeDaekketCount++;
 			}
 		}		
 		stats.totalCount = alleAdresser.size();
 		
+		ikkeDaekkedeAdresser.sort( null ); // ved Null comparator bruges Comparable interfacet
+		ikkeDaekkedeAdresser.sort( null );
+
 		
 		stats.elapsed = stop-start1;		
 		stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
@@ -573,7 +578,6 @@
 	public void clear() {
 		searchPostnrVejnavnGadeid.clear();
 		searchGadeidentAdresser.clear();
-		alleAdresser.clear();
 		helperCache.clear();
 	}
 	
@@ -625,25 +629,11 @@
 	}
 	
 	public List<Address> getNonCoveredAddresses() {
-		List<Address> result = new ArrayList<Address>(60000);
-		for (Address a : alleAdresser) {
-			if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
-				result.add(a);
-			}
-		}
-		Collections.sort(result );
-		return result;
+		return ikkeDaekkedeAdresser;
 	}
 	
 	public List<Address> get100PctAddresses() {
-		List<Address> result = new ArrayList<Address>(120000);
-		for (Address a : alleAdresser) {
-			if ( a.daekningsType == DaekningsType.DAEKNING_100PCT) {
-				result.add(a);
-			}
-		}
-		Collections.sort(result );
-		return result;
+		return hundredePctAdresser;
 	}
 	
 	///////////////////////////////////////////////////////////