Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/ImportTimeInterval.java @ 5780:5e3c9027e09c
avoid NPE in time interval import (made by R. Renkert)
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Mon, 22 Apr 2013 10:48:37 +0200 |
| parents | 300c0270c576 |
| children | 67e07c29dd29 |
comparison
equal
deleted
inserted
replaced
| 5779:ebec12def170 | 5780:5e3c9027e09c |
|---|---|
| 25 public ImportTimeInterval(Date startTime) { | 25 public ImportTimeInterval(Date startTime) { |
| 26 this.startTime = startTime; | 26 this.startTime = startTime; |
| 27 } | 27 } |
| 28 | 28 |
| 29 public ImportTimeInterval(Date startTime, Date stopTime) { | 29 public ImportTimeInterval(Date startTime, Date stopTime) { |
| 30 if (startTime.after(stopTime)) { | 30 Date start; |
| 31 this.stopTime = startTime; | 31 Date stop; |
| 32 this.startTime = stopTime; | 32 if (startTime == null) { |
| 33 start = stopTime; | |
| 34 stop = null; | |
| 35 } | |
| 36 else { | |
| 37 start = startTime; | |
| 38 stop = stopTime; | |
| 39 } | |
| 40 | |
| 41 if (stop != null && start.after(stop)) { | |
| 42 this.stopTime = start; | |
| 43 this.startTime = stop; | |
| 33 } | 44 } |
| 34 else { | 45 else { |
| 35 this.startTime = startTime; | 46 this.startTime = start; |
| 36 this.stopTime = stopTime; | 47 this.stopTime = stop; |
| 37 } | 48 } |
| 38 } | 49 } |
| 39 | 50 |
| 40 public Date getStartTime() { | 51 public Date getStartTime() { |
| 41 return startTime; | 52 return startTime; |