Repository: incubator-zeppelin Updated Branches: refs/heads/master 70a0f5c66 -> 0c4614028
ZEPPELIN-54: check for negative ms Fix for https://issues.apache.org/jira/browse/ZEPPELIN-54 -- check for negative ms, as well as NaN. Author: Timothy Shelton <[email protected]> Closes #45 from timothyshelton/master and squashes the following commits: 53b4291 [Timothy Shelton] ZEPPELIN-54: check for negative ms Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/0c461402 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/0c461402 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/0c461402 Branch: refs/heads/master Commit: 0c4614028e6cdea521e87d963c582a94ca2a677a Parents: 70a0f5c Author: Timothy Shelton <[email protected]> Authored: Tue Apr 21 00:11:48 2015 -0700 Committer: Lee moon soo <[email protected]> Committed: Thu Apr 23 14:12:48 2015 +0900 ---------------------------------------------------------------------- zeppelin-web/app/scripts/controllers/paragraph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/0c461402/zeppelin-web/app/scripts/controllers/paragraph.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/app/scripts/controllers/paragraph.js b/zeppelin-web/app/scripts/controllers/paragraph.js index 3b1d05f..f9b77e8 100644 --- a/zeppelin-web/app/scripts/controllers/paragraph.js +++ b/zeppelin-web/app/scripts/controllers/paragraph.js @@ -574,7 +574,7 @@ angular.module('zeppelinWebApp') $scope.getExecutionTime = function() { var pdata = $scope.paragraph; var timeMs = Date.parse(pdata.dateFinished) - Date.parse(pdata.dateStarted); - if (isNaN(timeMs)) { + if (isNaN(timeMs) || timeMs < 0) { return ' '; } return 'Took ' + (timeMs/1000) + ' seconds';
