Skip to content

Commit 7cac3fe

Browse files
authored
KNL-1526 Error report due to boolean in site cache. (sakaiproject#5102)
1 parent a35680a commit 7cac3fe

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteCacheSafe.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ public ToolConfiguration getTool(String toolId) {
213213
ToolConfiguration toolConfiguration = null;
214214
String siteRef = (String) m_cacheTools.get(toolId);
215215
if (siteRef != null) {
216-
Site site = (Site) m_cache.get(siteRef);
217-
if (site != null) {
218-
toolConfiguration = site.getTool(toolId);
216+
Object obj = m_cache.get(siteRef);
217+
if (obj != null && obj instanceof Site) {
218+
toolConfiguration = ((Site)obj).getTool(toolId);
219219
}
220220
}
221221
return toolConfiguration;
@@ -226,9 +226,9 @@ public SitePage getPage(String pageId) {
226226
SitePage sitePage = null;
227227
String siteRef = (String) m_cachePages.get(pageId);
228228
if (siteRef != null) {
229-
Site site = (Site) m_cache.get(siteRef);
230-
if (site != null) {
231-
sitePage = site.getPage(pageId);
229+
Object obj = m_cache.get(siteRef);
230+
if (obj != null && obj instanceof Site) {
231+
sitePage = ((Site)obj).getPage(pageId);
232232
}
233233
}
234234
return sitePage;
@@ -239,9 +239,9 @@ public Group getGroup(String groupId) {
239239
Group group = null;
240240
String siteRef = (String) m_cacheGroups.get(groupId);
241241
if (siteRef != null) {
242-
Site site = (Site) m_cache.get(siteRef);
243-
if (site != null) {
244-
group = site.getGroup(groupId);
242+
Object obj = m_cache.get(siteRef);
243+
if (obj != null && obj instanceof Site) {
244+
group = ((Site)obj).getGroup(groupId);
245245
}
246246
}
247247
return group;

0 commit comments

Comments
 (0)