[freenet-cvs] r21477 - in branches/db4o/freenet/src/freenet: client node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2008-07-29 14:44:46 +0000 (Tue, 29 Jul 2008)
New Revision: 21477

Modified:
   branches/db4o/freenet/src/freenet/client/FetchResult.java
   branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Revert last build, that's not the way to deal with it.

Modified: branches/db4o/freenet/src/freenet/client/FetchResult.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FetchResult.java   2008-07-29 
14:42:39 UTC (rev 21476)
+++ branches/db4o/freenet/src/freenet/client/FetchResult.java   2008-07-29 
14:44:46 UTC (rev 21477)
@@ -5,8 +5,6 @@

 import java.io.IOException;

-import com.db4o.ObjectContainer;
-
 import freenet.support.api.Bucket;
 import freenet.support.io.BucketTools;

@@ -34,11 +32,8 @@

        /** Get the MIME type of the fetched data. 
         * If unknown, returns application/octet-stream. */
-       public String getMimeType(ObjectContainer container) {
-               if(container != null)
-                       container.activate(metadata, 1);
-               String ret = metadata.getMIMEType();
-               return ret;
+       public String getMimeType() {
+               return metadata.getMIMEType();
        }

        public ClientMetadata getMetadata() {

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2008-07-29 
14:42:39 UTC (rev 21476)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2008-07-29 
14:44:46 UTC (rev 21477)
@@ -407,7 +407,7 @@
                        progressPending = null;
                        this.foundDataLength = returnBucket.size();
                        if(!binaryBlob)
-                               this.foundDataMimeType = 
result.getMimeType(persistenceType == PERSIST_FOREVER ? container : null);
+                               this.foundDataMimeType = result.getMimeType();
                        else
                                this.foundDataMimeType = BinaryBlob.MIME_TYPE;
                        this.succeeded = true;