Repository: incubator-gearpump Updated Branches: refs/heads/master bb69c71f6 -> b0c905b45
[GEARPUMP-278] Check for null before casting stored start clock Author: manuzhang <[email protected]> Closes #154 from manuzhang/app_data_store. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/b0c905b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/b0c905b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/b0c905b4 Branch: refs/heads/master Commit: b0c905b455cbd2db8d9ea8e125a38e6043541a72 Parents: bb69c71 Author: manuzhang <[email protected]> Authored: Tue Feb 21 10:35:02 2017 +0800 Committer: manuzhang <[email protected]> Committed: Tue Feb 21 10:35:29 2017 +0800 ---------------------------------------------------------------------- .../org/apache/gearpump/streaming/appmaster/ClockService.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b0c905b4/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala index 2a24b66..b1f0b23 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala @@ -60,8 +60,10 @@ class ClockService( override def preStart(): Unit = { LOG.info("Initializing Clock service, get snapshotted StartClock ....") - store.get(START_CLOCK).asInstanceOf[Future[TimeStamp]].map { clock => - val startClock = Option(clock).getOrElse(0L) + store.get(START_CLOCK).map { clock => + // check for null first since + // (null).asInstanceOf[TimeStamp] is zero + val startClock = if (clock != null) clock.asInstanceOf[TimeStamp] else MIN_TIME_MILLIS minCheckpointClock = Some(startClock)
