# HG changeset patch # User Raimund Renkert # Date 1478782171 -3600 # Node ID 7c510615a4e826f2617b980d76086d7d9fd2ccbc # Parent 67a85c6a7474e19be299ed711ec73abe6e1c7788# Parent cd9bf2430eef55508789b9445a3102d3d66e0593 merged. diff -r cd9bf2430eef -r 7c510615a4e8 src/main/java/de/intevation/lada/lock/TimestampLocker.java --- 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|