svn commit: r550629 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor: Comments.java Entries.java

[snoopdave]

Author: snoopdave
Date: Mon Jun 25 15:20:54 2007
New Revision: 550629

URL: http://svn.apache.org/viewvc?view=rev&rev=550629
Log:
Couple of JPA related fixes; don't modify collections returned by queries

Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=550629&r1=550628&r2=550629
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
 Mon Jun 25 15:20:54 2007
@@ -95,7 +95,7 @@
             }
             
             // query for comments
-            comments = wmgr.getComments(
+            List rawComments = wmgr.getComments(
                     getActionWeblog(),
                     queryEntry,
                     getBean().getSearchString(),
@@ -105,7 +105,8 @@
                     true, // reverse  chrono order
                     getBean().getPage() * COUNT,
                     COUNT + 1);
-            
+            comments = new ArrayList();
+            comments.addAll(rawComments);            
             if(comments != null && comments.size() > 0) {
                 if(comments.size() > COUNT) {
                     comments.remove(comments.size()-1);

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=550629&r1=550628&r2=550629
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
 Mon Jun 25 15:20:54 2007
@@ -75,7 +75,7 @@
     
     public String execute() {
         
-        if(log.isDebugEnabled()) {
+        if (log.isDebugEnabled()) {
             log.debug("entries bean is ...\n"+getBean().toString());
         }
         
@@ -85,7 +85,7 @@
             String status = getBean().getStatus();
             
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-            entries = wmgr.getWeblogEntries(
+            List<WeblogEntry> rawEntries = wmgr.getWeblogEntries(
                     getActionWeblog(),
                     null,
                     getBean().getStartDate(),
@@ -99,11 +99,12 @@
                     null,
                     getBean().getPage() * COUNT,
                     COUNT + 1);
-            
-            if(entries != null && entries.size() > 0) {
-                log.debug("query found "+entries.size()+" results");
+            entries = new ArrayList<WeblogEntry>();
+            entries.addAll(rawEntries);
+            if (entries != null && entries.size() > 0) {
+                log.debug("query found "+rawEntries.size()+" results");
                 
-                if(entries.size() > COUNT) {
+                if(rawEntries.size() > COUNT) {
                     entries.remove(entries.size()-1);
                     hasMore = true;
                 }