[Thaw-dev] r12800 - in trunk/apps/Thaw/src/thaw: fcp plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-18 22:44:07 +0000 (Wed, 18 Apr 2007)
New Revision: 12800

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
   trunk/apps/Thaw/src/thaw/plugins/index/Comment.java
Log:
Fix comment posting

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java   2007-04-18 20:44:03 UTC 
(rev 12799)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java   2007-04-18 22:44:07 UTC 
(rev 12800)
@@ -179,7 +179,9 @@
                        return false;
                }

-               if(!callStart && query.getIdentifier().startsWith(thawId)) {
+               if(!callStart
+                  && query.getIdentifier() != null
+                  && query.getIdentifier().startsWith(thawId)) {
                        /* It's a resumed query => We to adapt the next Id
                         * to avoid collisions.
                         */

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Comment.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Comment.java 2007-04-18 20:44:03 UTC 
(rev 12799)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Comment.java 2007-04-18 22:44:07 UTC 
(rev 12800)
@@ -198,12 +198,7 @@
                                                    2, false, 0);
                 put.addObserver(this);

-               boolean res = put.start(queueManager);
-
-               if (res)
-                       queueManager.addQueryToTheRunningQueue(put, false);
-
-               return res;
+               return queueManager.addQueryToTheRunningQueue(put, false);
        }