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

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

Author: adamw
Date: 2008-02-07 12:57:36 -0500 (Thu, 07 Feb 2008)
New Revision: 203

Modified:
   trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java
   trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
   trunk/src/model/org/jboss/blog/model/feed/Feed.java
Log:


Modified: trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java	2008-02-07 17:23:13 UTC (rev 202)
+++ trunk/src/action/org/jboss/blog/session/cache/CacheManagerHashMapImpl.java	2008-02-07 17:57:36 UTC (rev 203)
@@ -8,6 +8,9 @@
 import org.jboss.seam.ScopeType;
 import org.jboss.blog.model.feed.RestrictedFeed;
 import org.jboss.blog.model.RestrictedPost;
+import org.jboss.blog.model.RestrictedImage;
+import org.jboss.blog.model.RestrictedCategory;
+import org.jboss.blog.model.RestrictedEnclosure;
 import org.jboss.blog.session.xml.content.InMemoryContentResponse;
 
 import javax.annotation.PostConstruct;
@@ -45,10 +48,19 @@
     }
 
     private void readPost(RestrictedPost post) {
-        post.getFeed();
-        post.getCategories();
-        post.getEnclosures();
-        post.getImages();
+        post.getFeed().getId();
+
+        for (RestrictedCategory category : post.getCategories()) {
+            category.getId();
+        }
+
+        for (RestrictedEnclosure enclosure : post.getEnclosures()) {
+            enclosure.getId();
+        }
+
+        for (RestrictedImage image : post.getImages()) {
+            image.getId();
+        }
     }
 
     private void readPosts(List<? extends RestrictedPost> posts) {

Modified: trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java	2008-02-07 17:23:13 UTC (rev 202)
+++ trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java	2008-02-07 17:57:36 UTC (rev 203)
@@ -7,7 +7,6 @@
 import org.jboss.blog.model.Image;
 import org.jboss.blog.service.FeedsService;
 import org.jboss.blog.tools.GeneralTools;
-import org.jboss.blog.tools.StringTools;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.annotations.*;

Modified: trunk/src/model/org/jboss/blog/model/feed/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/Feed.java	2008-02-07 17:23:13 UTC (rev 202)
+++ trunk/src/model/org/jboss/blog/model/feed/Feed.java	2008-02-07 17:57:36 UTC (rev 203)
@@ -49,7 +49,6 @@
     private String link;
 
     @OneToMany(cascade = {CascadeType.REMOVE}, mappedBy = "feed")
-    @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     private List<Post> posts;
 
     @Lob