Author: rob.stryker(a)jboss.com Date: 2008-11-20 17:56:52 -0500 (Thu, 20 Nov 2008) New Revision: 11933 Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java Log: JBIDE-3233 - NPE removed via slightly better code and ConcurrentHashMap Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java 2008-11-20 22:20:31 UTC (rev 11932) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java 2008-11-20 22:56:52 UTC (rev 11933) @@ -11,6 +11,7 @@ package org.jboss.tools.jmx.ui.internal.views.navigator; import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -51,7 +52,7 @@ private String filterText, oldFilterText; - private HashMap<Object, Boolean> cache = new HashMap<Object, Boolean>(); + private ConcurrentHashMap<Object, Boolean> cache = new ConcurrentHashMap<Object, Boolean>(); private Navigator navigator; private boolean requiresRefine; private RefineThread refineThread = null; @@ -107,8 +108,9 @@ protected boolean cache(Object o, boolean refine, ITreeContentProvider provider) { if( !refine ) { - if( cache.get(o) != null ) { - return cache.get(o).booleanValue(); + Boolean val = cache.get(o); + if( val != null ) { + return val.booleanValue(); } } @@ -144,7 +146,7 @@ } protected void clearCache() { - cache = new HashMap<Object,Boolean>(); + cache = new ConcurrentHashMap<Object,Boolean>(); requiresRefine = false; }