roller/src/org/roller/business BookmarkManagerBase.java,1.6,1.7

Update of /cvsroot/roller/roller/src/org/roller/business
In directory sc8-pr-cvs1:/tmp/cvs-serv28933/src/org/roller/business

Modified Files:
        BookmarkManagerBase.java 
Log Message:
Gavin: "make sure you never catch + handle an exception and 
then keep using the session (ObjectNotFoundException included!)"

Index: BookmarkManagerBase.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/BookmarkManagerBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BookmarkManagerBase.java    3 Sep 2003 21:21:13 -0000       1.6
--- BookmarkManagerBase.java    14 Sep 2003 19:00:57 -0000      1.7
***************
*** 251,266 ****
          while (bookmarks.hasMoreElements())
          {
              BookmarkData bd = (BookmarkData)bookmarks.nextElement();
!             bd.setFolder( destFd );
!             storeBookmark( bd );
              
              // add to destination folder
              destFd.getBookmarks().add(bd);
          }
-         
-         // reset source folder to have no bookmarks
-         srcFd.getBookmarks().removeAllElements();
-         storeFolder( srcFd );
-               storeFolder( destFd );
      }
  
--- 251,262 ----
          while (bookmarks.hasMoreElements())
          {
+             // remove from source folder
              BookmarkData bd = (BookmarkData)bookmarks.nextElement();
!             srcFd.getBookmarks().remove(bd);
              
              // add to destination folder
+             bd.setFolder( destFd );
              destFd.getBookmarks().add(bd);
          }
      }
  




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf