From 6098ca73a3edb6a61c54594fba24c0cd52592419 Mon Sep 17 00:00:00 2001 From: Upayavira Date: Mon, 5 Oct 2015 11:00:05 +0000 Subject: [PATCH] SOLR-7686 Fix dashboard on Windows - don't show load average git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1706796 13f79535-47bb-0310-9956-ffa450edef68 --- solr/webapp/web/js/angular/controllers/index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/solr/webapp/web/js/angular/controllers/index.js b/solr/webapp/web/js/angular/controllers/index.js index 057653c6e1b..f7ce5a8d25d 100644 --- a/solr/webapp/web/js/angular/controllers/index.js +++ b/solr/webapp/web/js/angular/controllers/index.js @@ -22,11 +22,13 @@ solrAdminApp.controller('IndexController', function($scope, System, Cores, Const $scope.system = data; // load average - load_average = ( data.system.uptime || '' ).match( /load averages?: (\d+[.,]\d\d),? (\d+[.,]\d\d),? (\d+[.,]\d\d)/ ); - for (var i=0;i<2;i++) { - load_average[i]=load_average[i].replace(",","."); // for European users + var load_average = ( data.system.uptime || '' ).match( /load averages?: (\d+[.,]\d\d),? (\d+[.,]\d\d),? (\d+[.,]\d\d)/ ); + if (load_average) { + for (var i=0;i<2;i++) { + load_average[i]=load_average[i].replace(",","."); // for European users + } + $scope.load_average = load_average.slice(1); } - $scope.load_average = load_average.slice(1); // physical memory var memoryMax = parse_memory_value(data.system.totalPhysicalMemorySize);