Author: mcardle
Date: Thu Aug 3 06:46:37 2006
New Revision: 302
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=302&repname=esi_server
Log:
* fix for NPE
Modified:
trunk/src/org/jahia/esi/GetThread.java
Modified: trunk/src/org/jahia/esi/GetThread.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/src/org/jahia/esi/GetThread.java&rev=302&repname=esi_server
==============================================================================
--- trunk/src/org/jahia/esi/GetThread.java (original)
+++ trunk/src/org/jahia/esi/GetThread.java Thu Aug 3 06:46:37 2006
@@ -56,6 +56,7 @@
import org.jahia.esi.cache.CacheAdministrator;
import org.jahia.esi.cache.CacheObject;
import org.jahia.esi.cache.FragmentCache;
+import org.jahia.esi.cache.UrlCacheObject;
import org.jahia.esi.tags.EsiIncludeTag;
import org.jahia.esi.tags.EsiRemoveTag;
import org.jahia.esi.settings.SettingsBean;
@@ -737,7 +738,9 @@
referencedObjsEndIndex[pos]=esiTag.getEndPosition();
//safely free up this object for deletion since not used
anymore
- tagCacheObject.getUrlCacheObject().setInUse(false);
+ UrlCacheObject urlCacheObject =
tagCacheObject.getUrlCacheObject();
+ if (urlCacheObject!=null)
+ urlCacheObject.setInUse(false);
pos++;
}