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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-14 19:46:36 +0000 (Sat, 14 Jun 2008)
New Revision: 20350

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Some assertions

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-06-14 
19:45:13 UTC (rev 20349)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-06-14 
19:46:36 UTC (rev 20350)
@@ -97,6 +97,7 @@
         * acked yet, so it should be moved to the unacked-completed-requests 
set.
         */
        public void finishedClientRequest(ClientRequest get, FCPServer server, 
ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                assert(get.persistenceType == persistenceType);
                synchronized(this) {
                        if(runningPersistentRequests.remove(get)) {
@@ -111,6 +112,7 @@
         * will encourage clients to acknowledge persistent requests!
         */
        public void 
queuePendingMessagesOnConnectionRestart(FCPConnectionOutputHandler 
outputHandler, ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                Object[] reqs;
                synchronized(this) {
                        reqs = completedUnackedRequests.toArray();
@@ -123,6 +125,7 @@
         * Queue any and all pending messages from running requests. Happens on 
demand.
         */
        public void 
queuePendingMessagesFromRunningRequests(FCPConnectionOutputHandler 
outputHandler, ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                Object[] reqs;
                synchronized(this) {
                        reqs = runningPersistentRequests.toArray();
@@ -133,6 +136,7 @@

        public void register(ClientRequest cg, boolean startLater, 
ObjectContainer container) throws IdentifierCollisionException {
                assert(cg.persistenceType == persistenceType);
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                if(Logger.shouldLog(Logger.MINOR, this))
                        Logger.minor(this, "Registering 
"+cg.getIdentifier()+(startLater ? " to start later" : ""));
                synchronized(this) {
@@ -151,6 +155,7 @@
        }

        public void removeByIdentifier(String identifier, boolean kill, 
FCPServer server, ObjectContainer container) throws MessageInvalidException {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                ClientRequest req;
                boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
                if(logMINOR) Logger.minor(this, 
"removeByIdentifier("+identifier+ ',' +kill+ ')');
@@ -172,10 +177,12 @@
        }

        public boolean hasPersistentRequests(ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                return !(runningPersistentRequests.isEmpty() && 
completedUnackedRequests.isEmpty());
        }

        public void addPersistentRequests(Vector v, boolean onlyForever, 
ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                synchronized(this) {
                        Iterator i = runningPersistentRequests.iterator();
                        while(i.hasNext()) {
@@ -196,6 +203,7 @@
         * generated by the global queue).
         */
        public void setWatchGlobal(boolean enabled, int verbosityMask, 
FCPServer server, ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                if(isGlobalQueue) {
                        Logger.error(this, "Set watch global on global queue!");
                        return;
@@ -257,6 +265,7 @@
        }

        public synchronized ClientRequest getRequest(String identifier, 
ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                return (ClientRequest) 
clientRequestsByIdentifier.get(identifier);
        }

@@ -264,6 +273,7 @@
         * Start all delayed-start requests.
         */
        public void finishStart(ObjectContainer container) {
+               assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
                ClientRequest[] reqs;
                synchronized(this) {
                        reqs = (ClientRequest[]) toStart.toArray(new 
ClientRequest[toStart.size()]);