svnno****@sourc*****
svnno****@sourc*****
2008年 9月 4日 (木) 17:16:32 JST
Revision: 1114
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1114
Author: shinsuke
Date: 2008-09-04 17:16:32 +0900 (Thu, 04 Sep 2008)
Log Message:
-----------
fixed bugs from findbugs
Modified Paths:
--------------
pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/service/ContentService.java
-------------- next part --------------
Modified: pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/service/ContentService.java
===================================================================
--- pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/service/ContentService.java 2008-09-04 02:44:24 UTC (rev 1113)
+++ pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/service/ContentService.java 2008-09-04 08:16:32 UTC (rev 1114)
@@ -50,12 +50,19 @@
*/
public class ContentService implements Serializable {
- private HttpServletRequest request;
+ private transient HttpServletRequest request;
private transient PageManager pageManager = null;
- private transient Map<String, Fragment> fragmentCache = new HashMap<String, Fragment>();
+ private transient Map<String, Fragment> fragmentCache;
+ public Map<String, Fragment> getFragmentCache() {
+ if (fragmentCache == null) {
+ fragmentCache = new HashMap<String, Fragment>();
+ }
+ return fragmentCache;
+ }
+
/**
* @return the pageManager
*/
@@ -181,7 +188,7 @@
protected Fragment getFragmentFromCache(String path, String fragmentId)
throws WcmException {
String key = path + WcmConstants.FRAGMENT_SEPARATOR + fragmentId;
- Fragment fragment = fragmentCache.get(key);
+ Fragment fragment = getFragmentCache().get(key);
if (fragment == null) {
ContentPage page = null;
try {
@@ -191,7 +198,7 @@
new Object[] { path }, e);
}
fragment = page.getFragmentById(fragmentId);
- fragmentCache.put(key, fragment);
+ getFragmentCache().put(key, fragment);
}
return fragment;
}
@@ -217,7 +224,7 @@
Fragment fragment = page.getFragmentById(fragmentId);
// cache
String key = path + WcmConstants.FRAGMENT_SEPARATOR + fragmentId;
- fragmentCache.put(key, fragment);
+ getFragmentCache().put(key, fragment);
setFragmentPreferenceValue(fragment, WcmConstants.TITLE + localeName,
title);
@@ -310,7 +317,7 @@
Fragment fragment = page.getFragmentById(fragmentId);
// cache
String key = path + WcmConstants.FRAGMENT_SEPARATOR + fragmentId;
- fragmentCache.put(key, fragment);
+ getFragmentCache().put(key, fragment);
// TODO check above
@@ -356,7 +363,7 @@
Fragment fragment = page.getFragmentById(fragmentId);
// cache
String key = path + WcmConstants.FRAGMENT_SEPARATOR + fragmentId;
- fragmentCache.put(key, fragment);
+ getFragmentCache().put(key, fragment);
// TODO check above