You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/03/17 13:42:06 UTC

svn commit: r1578345 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java

Author: gmazza
Date: Mon Mar 17 12:42:05 2014
New Revision: 1578345

URL: http://svn.apache.org/r1578345
Log:
fix bug of duplicate new bookmark items being created with each new blog.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1578345&r1=1578344&r2=1578345&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Mon Mar 17 12:42:05 2014
@@ -310,9 +310,9 @@ public class JPAWeblogManagerImpl implem
         this.strategy.store(newWeblog);
 
         // add default bookmarks
-        WeblogBookmarkFolder root = new WeblogBookmarkFolder(
+        WeblogBookmarkFolder defaultFolder = new WeblogBookmarkFolder(
                 "default", newWeblog);
-        this.strategy.store(root);
+        this.strategy.store(defaultFolder);
         
         String blogroll = WebloggerConfig.getProperty("newuser.blogroll");
         if (blogroll != null) {
@@ -321,14 +321,13 @@ public class JPAWeblogManagerImpl implem
                 String[] rollitems = splitroll[i].split("\\|");
                 if (rollitems != null && rollitems.length > 1) {
                     WeblogBookmark b = new WeblogBookmark(
-                            root,                // parent
+                            defaultFolder,       // parent
                             rollitems[0],        // name
                             "",                  // description
                             rollitems[1].trim(), // url
                             null,                // feedurl
                             null);               // image
                     this.strategy.store(b);
-                    root.getBookmarks().add(b);
                 }
             }
         }