Fixed BLUR-407 ConcurrentModification
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/f4ac13f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/f4ac13f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/f4ac13f9 Branch: refs/heads/master Commit: f4ac13f9a9b89e9bf007cabb1f86b20d483783cb Parents: ef5af6c Author: Andrew Avenoso <[email protected]> Authored: Thu Mar 5 15:57:27 2015 -0500 Committer: Andrew Avenoso <[email protected]> Committed: Thu Mar 5 15:57:27 2015 -0500 ---------------------------------------------------------------------- .../blur/console/util/CachingBlurClient.java | 16 ++--------- .../src/main/webapp/js/blurconsole.tables.js | 1 - blur-console/src/main/webapp/public/index.html | 2 +- ...rconsole.3c80482ea81b06b3ee948714c66a7c45.js | 28 ++++++++++++++++++++ ...rconsole.5bcbaf86245458b03be6ef5c1d6282f0.js | 28 -------------------- .../src/main/webapp/public/js/blurconsole.js | 4 +-- ...sole.js.ab91fee8bb041bbb9c88685edb0b55ed.map | 1 + ...sole.js.af6f514ba14876bd0ad5146ee55b0d66.map | 1 - .../main/webapp/public/js/blurconsole.js.map | 2 +- 9 files changed, 35 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4ac13f9/blur-console/src/main/java/org/apache/blur/console/util/CachingBlurClient.java ---------------------------------------------------------------------- diff --git a/blur-console/src/main/java/org/apache/blur/console/util/CachingBlurClient.java b/blur-console/src/main/java/org/apache/blur/console/util/CachingBlurClient.java index 5bc048b..ba62435 100644 --- a/blur-console/src/main/java/org/apache/blur/console/util/CachingBlurClient.java +++ b/blur-console/src/main/java/org/apache/blur/console/util/CachingBlurClient.java @@ -134,7 +134,7 @@ public class CachingBlurClient { } else { cacheHits++; } - return (T) item.value; + return (T) item.getValue(); } } @@ -152,27 +152,15 @@ public class CachingBlurClient { getClient().addColumnDefinition(table, def); } - @SuppressWarnings("unchecked") private void invalidateQuery(String table, String uuid) { - synchronized (queryListCache) { - Item item = queryListCache.get(null); - if(item != null && item.getValue() != null) { - ((List<String>)(item.getValue())).remove(uuid); - } - } synchronized (queryStatusCache) { queryStatusCache.remove(queryKey(table,uuid)); } } - @SuppressWarnings("unchecked") private void invalidateTable(String table) { synchronized (tableListCache) { - for(Item item: tableListCache.values()) { - if(item != null && item.getValue() != null) { - ((List<String>)(item.getValue())).remove(table); - } - } + tableListCache.clear(); } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4ac13f9/blur-console/src/main/webapp/js/blurconsole.tables.js ---------------------------------------------------------------------- diff --git a/blur-console/src/main/webapp/js/blurconsole.tables.js b/blur-console/src/main/webapp/js/blurconsole.tables.js index c5ebd55..b7a626a 100644 --- a/blur-console/src/main/webapp/js/blurconsole.tables.js +++ b/blur-console/src/main/webapp/js/blurconsole.tables.js @@ -28,7 +28,6 @@ blurconsole.tables = (function () { if(row.enabled) { activityIndicator = ' <i class="glyphicon glyphicon-exclamation-sign" data-table="' + row.name + '" style="display:none" title="Activity detected"></i>'; } - console.log(row); if(row.error) { errorIndicator = ' <i class="glyphicon glyphicon-ban-circle" title="'+row.error+'"></i>'; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4ac13f9/blur-console/src/main/webapp/public/index.html ---------------------------------------------------------------------- diff --git a/blur-console/src/main/webapp/public/index.html b/blur-console/src/main/webapp/public/index.html index 78ac6af..4b7cf32 100644 --- a/blur-console/src/main/webapp/public/index.html +++ b/blur-console/src/main/webapp/public/index.html @@ -64,7 +64,7 @@ under the License. </ul> </nav> <div id="blurconsole"></div> - <script src="js/blurconsole.5bcbaf86245458b03be6ef5c1d6282f0.js"></script> + <script src="js/blurconsole.3c80482ea81b06b3ee948714c66a7c45.js"></script> <script src="service/config.js"></script> <script type="text/javascript"> $(function () { blurconsole.initModule( $('#blurconsole') ); });
