--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/13 15:45:24	2283
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/15 10:11:13	2296
@@ -21,14 +21,15 @@
 		
 		String sql = "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute "
 				+ "FROM fulddaekning.adressetabel "
-				//+ "WHERE postnr >=2000" //DEBUG only
+				+ "WHERE gadeid IS NOT NULL "
+				//+ "AND postnr = 8700" //DEBUG only
 				;
 		
 		Connection conn = DBConnection.getConnection();		
 		Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
 		ResultSet res = stmt.executeQuery(sql);
 		
-		List<Address> list = new ArrayList<Address>();
+		List<Address> list = new ArrayList<Address>(2600000);//initial capacity 2.6 mio
 		
 		while (res.next()) {
 			Address a = new Address();
@@ -65,6 +66,10 @@
 	}
 	
 	public static List<ExtendedBean> getExtendedAdresslist() throws SQLException {
+		//DEBUG
+		if (true)
+			return new ArrayList<ExtendedBean>();
+		
 		String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " +
 					"join odbc.transporttype t " + 
 					"on t.Art = 'Transpost' " +
@@ -82,7 +87,7 @@
 		Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
 		ResultSet res = stmt.executeQuery(sql);
 		
-		List<ExtendedBean> list = new ArrayList<ExtendedBean>();
+		List<ExtendedBean> list = new ArrayList<ExtendedBean>( 350000); //Initial capacity 350K
 		while (res.next()) {
 			ExtendedBean eb = new ExtendedBean();
 			eb.orgId = res.getInt(1);
@@ -128,7 +133,7 @@
 		stmt.close();
 		conn.close();
 		
-		System.out.println("Loaded " + map.size() + " extendedbeans");
+		System.out.println("Loaded " + map.size() + " 100pct beans");
 		
 		return map;