Mercurial > lada > lada-server
changeset 1172:7c510615a4e8
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 10 Nov 2016 13:49:31 +0100 |
| parents | 67a85c6a7474 (diff) cd9bf2430eef (current diff) |
| children | 60b91dbb98cc |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/lock/TimestampLocker.java Wed Nov 09 17:24:49 2016 +0100 +++ b/src/main/java/de/intevation/lada/lock/TimestampLocker.java Thu Nov 10 13:49:31 2016 +0100 @@ -111,6 +111,9 @@ try { m = o.getClass().getMethod("getParentModified"); Timestamp ot = (Timestamp)m.invoke(o); + if (ot == null) { + return true; + } return t.getTime() > ot.getTime(); } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException|