1.1 --- a/openide.util/src/org/openide/util/IconManager.java	Thu Apr 27 08:20:53 2006 +0000
     1.2 +++ b/openide.util/src/org/openide/util/IconManager.java	Wed May 03 11:43:29 2006 +0000
     1.3 @@ -112,7 +112,7 @@
     1.4                  }
     1.5  
     1.6                  // icon found
     1.7 -                if (ref != null) {
     1.8 +                if (img != null) {
     1.9                      return img;
    1.10                  }
    1.11  
    1.12 @@ -138,7 +138,7 @@
    1.13                  java.net.URL baseurl = (loader != null) ? loader.getResource(resource) // NOPMD
    1.14                          : IconManager.class.getClassLoader().getResource(resource);
    1.15                  Iterator it = NbBundle.getLocalizingSuffixes();
    1.16 -
    1.17 +                
    1.18                  while (it.hasNext()) {
    1.19                      String suffix = (String) it.next();
    1.20                      Image i;
    1.21 @@ -262,10 +262,10 @@
    1.22          Image cached;
    1.23  
    1.24          synchronized (map) {
    1.25 -            Reference r = (Reference) map.get(k);
    1.26 +            ActiveRef r = map.get(k);
    1.27  
    1.28              if (r != null) {
    1.29 -                cached = (Image) r.get();
    1.30 +                cached = r.get();
    1.31  
    1.32                  if (cached != null) {
    1.33                      return cached;