--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/Database.java 2016/01/30 14:12:51 2879 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/Database.java 2016/01/30 14:15:53 2880 @@ -271,43 +271,44 @@ Constants consts = Constants.getInstance(); //logger.info("Starting query"); - ResultSet res = stmt.executeQuery(); - //logger.info("Starting exec query done"); - - while (res.next()) { - - double latitude = res.getDouble(7); - double longitude = res.getDouble(8); - - - Address adr = new Address(latitude,longitude); - - adr.id = res.getInt(1); - adr.postnr = res.getShort(2); - adr.vejnavn = vejnavnCache.getInstance( res.getString(3) ); - adr.gadeid = res.getInt(4); - adr.husnr = res.getShort(5); - adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); - //adr.latitude = res.getDouble(7); - //adr.longitude = res.getDouble(8); - adr.ruteMandag = ruteCache.getInstance( res.getString(9) ); - adr.ho = res.getShort(10); - - list.add(adr); + try ( ResultSet res = stmt.executeQuery() ) { + - if (consts.doCheckHO() == true && adr.ho == 0) { - System.out.println( "Mangler HO" ); - System.out.println( adr ); - System.exit(0); + while (res.next()) { + + double latitude = res.getDouble(7); + double longitude = res.getDouble(8); + + + Address adr = new Address(latitude,longitude); + + adr.id = res.getInt(1); + adr.postnr = res.getShort(2); + adr.vejnavn = vejnavnCache.getInstance( res.getString(3) ); + adr.gadeid = res.getInt(4); + adr.husnr = res.getShort(5); + adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); + //adr.latitude = res.getDouble(7); + //adr.longitude = res.getDouble(8); + adr.ruteMandag = ruteCache.getInstance( res.getString(9) ); + adr.ho = res.getShort(10); + + list.add(adr); + + if (consts.doCheckHO() == true && adr.ho == 0) { + System.out.println( "Mangler HO" ); + System.out.println( adr ); + System.exit(0); + } + + //logger.info( "Adress:" + adr); } - - //logger.info( "Adress:" + adr); + + res.close(); + stmt.close(); + + return list; } - - res.close(); - stmt.close(); - - return list; } }