Mercurial > dive4elements > river
comparison etl/src/main/java/org/dive4elements/river/etl/aft/Rivers.java @ 7006:5fe8c64b48d4
Fix for flys/issue1479: Really iterate over the FLYS river not over empty list.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Fri, 13 Sep 2013 12:02:40 +0200 |
| parents | b3e2abe359d8 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 7000:7a7cb22395b4 | 7006:5fe8c64b48d4 |
|---|---|
| 31 ) { | 31 ) { |
| 32 List<River> rivers = new ArrayList<River>(); | 32 List<River> rivers = new ArrayList<River>(); |
| 33 | 33 |
| 34 needle = needle.toLowerCase(); | 34 needle = needle.toLowerCase(); |
| 35 | 35 |
| 36 for (River river: rivers) { | 36 for (River river: flysRivers) { |
| 37 String name = river.getName().toLowerCase(); | 37 String name = river.getName().toLowerCase(); |
| 38 if (name.contains(needle)) { | 38 if (name.contains(needle)) { |
| 39 rivers.add(river); | 39 rivers.add(river); |
| 40 } | 40 } |
| 41 } | 41 } |
| 87 aftRs.close(); | 87 aftRs.close(); |
| 88 } | 88 } |
| 89 | 89 |
| 90 boolean modified = false; | 90 boolean modified = false; |
| 91 | 91 |
| 92 if (log.isDebugEnabled()) { | |
| 93 log.debug("Rivers found in FLYS and AFT:"); | |
| 94 for (River river: commonRivers) { | |
| 95 log.debug(" " + river.getName()); | |
| 96 } | |
| 97 log.debug("---"); | |
| 98 } | |
| 99 | |
| 92 for (River river: commonRivers) { | 100 for (River river: commonRivers) { |
| 93 modified |= river.sync(context); | 101 modified |= river.sync(context); |
| 94 } | 102 } |
| 95 | 103 |
| 96 return modified; | 104 return modified; |