[jboss-cvs] JBossBlog SVN: r333 - in trunk: src/action/org/jboss/blog/session/cache and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-10-24 04:21:11 -0400 (Fri, 24 Oct 2008)
New Revision: 333

Modified:
   trunk/blog.iml
   trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java
   trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
Log:
JBBLOG-75 fix

Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml	2008-09-17 15:41:53 UTC (rev 332)
+++ trunk/blog.iml	2008-10-24 08:21:11 UTC (rev 333)
@@ -507,6 +507,24 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/standard.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jstl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java	2008-09-17 15:41:53 UTC (rev 332)
+++ trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java	2008-10-24 08:21:11 UTC (rev 333)
@@ -17,6 +17,7 @@
 import java.lang.ref.SoftReference;
 import java.util.List;
 import java.util.Map;
+import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -82,12 +83,17 @@
         return feedName + "/" + from + "/" + to;
     }
 
+    private <T> List<T> copyList(List<T> original) {
+        return new ArrayList<T>(original);
+    }
+
     public void putFeedPosts(RestrictedFeed feed, List<? extends RestrictedPost> posts, int from, int to) {
         readPosts(posts);
 
         log.debug("Putting feed '#0' posts into the cache, from #1 to #2.", feed.getName(), from, to);
         
-        cache.put(getFeedPostsFqn(feed.getName(), from, to), new SoftReference<List<? extends RestrictedPost>>(posts));
+        cache.put(getFeedPostsFqn(feed.getName(), from, to), new SoftReference<List<? extends RestrictedPost>>(
+                copyList(posts)));
     }
 
     public List<? extends RestrictedPost> getFeedPosts(String feedName, int from, int to) {
@@ -97,7 +103,7 @@
                         getFeedPostsFqn(feedName, from, to))));
         log.debug("Getting feed '#0' posts from the cache, from #1 to #2, result: #3.",
                 feedName, from, to, inCache);
-        return inCache;
+        return inCache == null ? null : copyList(inCache);
     }
 
     //

Modified: trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java	2008-09-17 15:41:53 UTC (rev 332)
+++ trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java	2008-10-24 08:21:11 UTC (rev 333)
@@ -82,7 +82,7 @@
                 .getResultList().size();
 
         if (currentPostSize > 0) {
-            log.warn("Trying to save a duplicate post, merge to: #1, merge from: #2!", mergeTo.getCurrent(),
+            log.warn("Trying to save a duplicate post, merge to: #0, merge from: #1!", mergeTo.getCurrent(),
                     mergeFrom.getCurrent());
             return false;
         } else {