*) hopefully fixing NPE issue introduced in r6797

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6808 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/data/BookmarkDate.java

@@ -63,7 +63,7 @@ public class BookmarkDate {
     }
     
     // rebuilds the datesDB from the bookmarksDB
-    public void init(Iterator<Bookmark> it) {
+    public void init(final Iterator<Bookmark> it) {
         Log.logInfo("BOOKMARKS", "start init dates.db from bookmarks.db...");
         //final Iterator<Bookmark> it=bookmarkIterator(true);
         Bookmark bookmark;        
@@ -72,7 +72,7 @@ public class BookmarkDate {
         int count = 0;
         while (it.hasNext()) {
             bookmark=it.next();
-            if (bookmark == null) continue;
+//            if (bookmark == null) continue;
             date = String.valueOf(bookmark.getTimeStamp());
             bmDate=getDate(date);
             if(bmDate==null){

source/de/anomic/data/bookmarksDB.java

@@ -49,7 +49,6 @@ import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.order.NaturalOrder;
 import net.yacy.kelondro.util.DateFormatter;
-import net.yacy.kelondro.util.kelondroException;
 import net.yacy.kelondro.workflow.BusyThread;
 import net.yacy.kelondro.workflow.InstantBusyThread;
 
@@ -102,7 +101,7 @@ public class bookmarksDB {
         String[] tagArray;
         while(it.hasNext()){
             bookmark = it.next();
-            if (bookmark == null) continue;
+//            if (bookmark == null) continue;
             tagArray = BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()).split(",");
             tag = null;
             for (final String element : tagArray) {
@@ -374,7 +373,7 @@ public class bookmarksDB {
         Bookmark bm;
         while(it.hasNext()){
             bm=it.next();
-            if (bm == null) continue;
+//            if (bm == null) continue;
             if(priv || bm.getPublic()){
             	set.add(bm.getUrlHash());
             }
@@ -483,7 +482,7 @@ public class bookmarksDB {
             it = tagSet.iterator();
             while (it.hasNext()) {
                 tag=getTag(BookmarkHelper.tagHash(it.next()) );
-        		if(priv ||tag.hasPublicItems()){
+                if((priv ||tag.hasPublicItems()) && tag != null){
                         set.add(tag);
                 }
             }
@@ -865,22 +864,11 @@ public class bookmarksDB {
         }
         
         public boolean hasNext() {
-            try {
             return this.bookmarkIter.hasNext();
-            } catch (final kelondroException e) {
-            	Log.logException(e);
-                return false;
-            }
         }
         
         public Bookmark next() {
-        	try {
+            return getBookmark(new String(this.bookmarkIter.next()));
-                String s = new String(this.bookmarkIter.next());
-                return getBookmark(s);
-        	} catch (final kelondroException e) {
-                Log.logException(e);
-                return null;
-            }
         }
         
         public void remove() {