[WebMacro-cvs] webmacro/src/org/webmacro/resource ReloadingCacheManager.java, 1.2, 1.3

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18291/src/org/webmacro/resource

Modified Files:
	ReloadingCacheManager.java 
Log Message:
Eclipse: r may be null, though we know it may not: brackets make it explicit

Index: ReloadingCacheManager.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/ReloadingCacheManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReloadingCacheManager.java	21 Jul 2004 16:13:05 -0000	1.2
--- ReloadingCacheManager.java	25 Mar 2008 23:01:34 -0000	1.3
***************
*** 192,202 ****
  
          r = (MyCacheElement) _cache.get(query);
!         if (r != null)
              o = r.getObject();
  
!         // should the template be reloaded, regardless of cached status?
!         if (o != null && r.reloadContext != null && _reloadOnChange)
!             reload = r.reloadContext.shouldReload();
! 
          if (o == null || reload)
          {
--- 192,202 ----
  
          r = (MyCacheElement) _cache.get(query);
!         if (r != null) {
              o = r.getObject();
  
!             // should the template be reloaded, regardless of cached status?
!             if (o != null && r.reloadContext != null && _reloadOnChange)
!                 reload = r.reloadContext.shouldReload();
!         }
          if (o == null || reload)
          {