--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2015/06/09 09:32:32	2574
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2015/06/09 19:42:00	2575
@@ -34,12 +34,12 @@
 	DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
 	DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); 
 	
-	Set<Integer> postnumre = new TreeSet<Integer>();
+	Set<Short> postnumre = new TreeSet<Short>();
 	
-	Map<Integer, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Integer, List<Adresse>>(); 
+	Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>(); 
 	
 	
-	private HashMap<Integer,BoundingBox> bbCache = new HashMap<Integer,BoundingBox>();
+	private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>();
 
 	public Database(SafeProperties conf)  throws SQLException,IOException {
 		this.conn = getConnection( conf );	
@@ -76,13 +76,13 @@
 		conn.createStatement().executeUpdate(sql);		
 	}
 	
-	public BoundingBox getBoundingbox(int postnr)  {
+	public BoundingBox getBoundingbox(short postnr)  {
 		BoundingBox bb = bbCache.get(postnr);
 		return bb.clone();//never return the original / cached object
 	}
 	
 	
-	public Set<Integer> hentPostnumreCache() {
+	public Set<Short> hentPostnumreCache() {
 		return postnumre;
 	}
 
@@ -139,7 +139,7 @@
 		}
 	}
 	
-	public Queue<Adresse> hentIkkedaekkedeAdresserCache(int postnr)  {
+	public Queue<Adresse> hentIkkedaekkedeAdresserCache(short postnr)  {
 		List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr);
 		
 		return new ConcurrentLinkedQueue<Adresse>(postListe);		
@@ -198,10 +198,10 @@
 		PreparedStatement saveStmt = conn.prepareStatement(sql);*/
 
 		saveStmt.setInt(1, orgAdresse.id);
-		saveStmt.setInt(2, orgAdresse.postnr);
+		saveStmt.setShort(2, orgAdresse.postnr);
 		saveStmt.setString(3, orgAdresse.adresse);
 		saveStmt.setInt(4, orgAdresse.gadeid);
-		saveStmt.setInt(5, orgAdresse.husnr);
+		saveStmt.setShort(5, orgAdresse.husnr);
 		saveStmt.setString(6, orgAdresse.husnrbogstav);
 		saveStmt.setDouble(7, orgAdresse.latitude);
 		saveStmt.setDouble(8, orgAdresse.longitude);
@@ -209,10 +209,10 @@
 
 
 		saveStmt.setInt(10, bedsteAdresse.id);
-		saveStmt.setInt(11, bedsteAdresse.postnr);
+		saveStmt.setShort(11, bedsteAdresse.postnr);
 		saveStmt.setString(12, bedsteAdresse.adresse);
 		saveStmt.setInt(13, bedsteAdresse.gadeid);
-		saveStmt.setInt(14, bedsteAdresse.husnr);
+		saveStmt.setShort(14, bedsteAdresse.husnr);
 		saveStmt.setString(15, bedsteAdresse.husnrbogstav);
 		saveStmt.setDouble(16, bedsteAdresse.latitude);
 		saveStmt.setDouble(17, bedsteAdresse.longitude);
@@ -263,15 +263,15 @@
 			*/
 	
 			adr.id = res.getInt(1);
-			adr.postnr = res.getInt(2);
+			adr.postnr = res.getShort(2);
 			adr.adresse = res.getString(3);
 			adr.gadeid = res.getInt(4);
-			adr.husnr = res.getInt(5);
+			adr.husnr = res.getShort(5);
 			adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );
 			adr.latitude = res.getDouble(7);
 			adr.longitude = res.getDouble(8);
 			adr.rute =  ruteCache.getInstance( res.getString(9) );
-			adr.ho = res.getInt(10);
+			adr.ho = res.getShort(10);
 
 			list.add(adr);