[freenet-cvs] r20492 - branches/db4o/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2008-06-19 15:30:08 +0000 (Thu, 19 Jun 2008)
New Revision: 20492

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Fix a mask problem, apparently preventing status messages from showing up for 
non-global persistent requests.

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-06-19 
15:17:05 UTC (rev 20491)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-06-19 
15:30:08 UTC (rev 20492)
@@ -246,7 +246,11 @@
        }

        public void queueClientRequestMessage(FCPMessage msg, int 
verbosityLevel) {
-               if((verbosityLevel & watchGlobalVerbosityMask) != 
verbosityLevel)
+               queueClientRequestMessage(msg, verbosityLevel, false);
+       }
+       
+       public void queueClientRequestMessage(FCPMessage msg, int 
verbosityLevel, boolean useGlobalMask) {
+               if(useGlobalMask && (verbosityLevel & watchGlobalVerbosityMask) 
!= verbosityLevel)
                        return;
                FCPConnectionHandler conn = getConnection();
                if(conn != null) {
@@ -262,7 +266,7 @@
                        }
                        if(clients != null)
                        for(int i=0;i<clients.length;i++)
-                               clients[i].queueClientRequestMessage(msg, 
verbosityLevel);
+                               clients[i].queueClientRequestMessage(msg, 
verbosityLevel, true);
                }
        }