[freenet-cvs] r18391 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2008-03-06 15:49:08 +0000 (Thu, 06 Mar 2008)
New Revision: 18391

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/clients/http/ToadletContext.java
   trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
Log:
Fix NPE in starting fproxy

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2008-03-06 
15:33:05 UTC (rev 18390)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2008-03-06 
15:49:08 UTC (rev 18391)
@@ -71,8 +71,7 @@
                client.setMaxLength(MAX_LENGTH);
                client.setMaxIntermediateLength(MAX_LENGTH);
                this.core = core;
-               if(this.container.enableInlinePrefetch()) {
-                       prefetchHook = new FoundURICallback() {
+               prefetchHook = new FoundURICallback() {

                                public void foundURI(FreenetURI uri) {
                                        // Ignore
@@ -89,7 +88,6 @@
                                }

                        };
-               }
        }

        public String supportedMethods() {
@@ -134,7 +132,7 @@

                try {
                        if((!force) && (!forceDownload)) {
-                               FilterOutput fo = ContentFilter.filter(data, 
bucketFactory, mimeType, key.toURI(basePath), prefetchHook);
+                               FilterOutput fo = ContentFilter.filter(data, 
bucketFactory, mimeType, key.toURI(basePath), 
context.getContainer().enableInlinePrefetch() ? prefetchHook : null);
                                data = fo.data;
                                mimeType = fo.type;


Modified: trunk/freenet/src/freenet/clients/http/ToadletContext.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContext.java  2008-03-06 
15:33:05 UTC (rev 18390)
+++ trunk/freenet/src/freenet/clients/http/ToadletContext.java  2008-03-06 
15:49:08 UTC (rev 18391)
@@ -79,5 +79,7 @@
         * Return a robots.txt excluding all spiders and other non-browser HTTP 
clients?
         */
        boolean doRobots();
+
+       ToadletContainer getContainer();
 }


Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java      
2008-03-06 15:33:05 UTC (rev 18390)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java      
2008-03-06 15:49:08 UTC (rev 18391)
@@ -459,4 +459,8 @@
        public void forceDisconnect() {
                this.shouldDisconnect = true;
        }
+
+       public ToadletContainer getContainer() {
+               return container;
+       }
 }