fixed a bug with news; news moving could lead to shurtcut loop / 100% CPU; appeared when clicked on a 'Profile' news in Network menu

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

source/de/anomic/yacy/yacyNewsPool.java

@@ -265,20 +265,10 @@ public class yacyNewsPool {
 
     private boolean moveOff(yacyNewsQueue fromqueue, yacyNewsQueue toqueue, String id) throws IOException {
         // called if a published news shall be removed
-        // the news is also removed from the news database
-        yacyNewsRecord record;
-        synchronized (fromqueue) {
-            while (fromqueue.size() > 0) {
-                record = fromqueue.top(0);
-                if ((record != null) && (record.id().equals(id))) {
-                    fromqueue.pop(0);
-                    if (toqueue != null) toqueue.push(record);
-                    //newsDB.remove(id);
-                    return true;
-                }
-            }
-        }
-        return false;
+        yacyNewsRecord record = fromqueue.remove(id);
+        if (record == null) return false;
+        toqueue.push(record);
+        return true;
     }
     
     

source/de/anomic/yacy/yacyNewsQueue.java

@@ -129,6 +129,19 @@ public class yacyNewsQueue {
         return entry;
     }
     
+    public synchronized yacyNewsRecord remove(String id) throws IOException {
+        yacyNewsRecord record;
+        for (int i = 0; i < size(); i++) {
+            record = top(i);
+            if ((record != null) && (record.id().equals(id))) {
+                pop(i);
+                return record;
+            }
+        }
+        return null;
+    }
+    
+    
     /*
     public synchronized void incDistributedCounter(yacyNewsRecord entry) throws IOException {
         // this works only if the entry element lies ontop of the stack