From: Timo H. <tho...@us...> - 2006-11-14 11:26:43
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31081/Sources/er/extensions Modified Files: ERXInlineTemplate.java Log Message: formatting Index: ERXInlineTemplate.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXInlineTemplate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ERXInlineTemplate.java 14 Nov 2006 11:13:26 -0000 1.1 --- ERXInlineTemplate.java 14 Nov 2006 11:26:38 -0000 1.2 *************** *** 158,166 **** CacheEntry cacheEntry = (CacheEntry) _cache.valueForKey(cacheKey); Object requestedVersion = valueForBinding(CACHE_VERSION_BINDING); ! if (cacheEntry != null && (requestedVersion == null || requestedVersion.equals(cacheEntry.version()))) { // requestedVersion ! // matches ! // or ! // is ! // null if (log.isDebugEnabled()) log.debug("using cache: " + cacheKey + " / " + cacheEntry.version()); --- 158,163 ---- CacheEntry cacheEntry = (CacheEntry) _cache.valueForKey(cacheKey); Object requestedVersion = valueForBinding(CACHE_VERSION_BINDING); ! if (cacheEntry != null && (requestedVersion == null || requestedVersion.equals(cacheEntry.version()))) { ! // requestedVersion matches or is null if (log.isDebugEnabled()) log.debug("using cache: " + cacheKey + " / " + cacheEntry.version()); |