diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index 7ea0490bf..8c1227eac 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -224,8 +224,20 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { _gzipOut = new InternalGZIPOutputStream(out); out = _gzipOut; } - public long getTotalRead() { return _gzipOut.getTotalRead(); } - public long getTotalCompressed() { return _gzipOut.getTotalCompressed(); } + public long getTotalRead() { + InternalGZIPOutputStream gzipOut = _gzipOut; + if (gzipOut != null) + return gzipOut.getTotalRead(); + else + return 0; + } + public long getTotalCompressed() { + InternalGZIPOutputStream gzipOut = _gzipOut; + if (gzipOut != null) + return gzipOut.getTotalCompressed(); + else + return 0; + } } private class InternalGZIPOutputStream extends GZIPOutputStream { public InternalGZIPOutputStream(OutputStream target) throws IOException { diff --git a/apps/syndie/java/src/net/i2p/syndie/Updater.java b/apps/syndie/java/src/net/i2p/syndie/Updater.java index 58ac8f48a..ae618b645 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Updater.java +++ b/apps/syndie/java/src/net/i2p/syndie/Updater.java @@ -71,7 +71,9 @@ public class Updater { try { Thread.currentThread().sleep(5*60*1000); } catch (InterruptedException ie) {} - + + // creates the default user if necessary + BlogManager.instance().getDefaultUser(); while (true) { int delay = BlogManager.instance().getUpdateDelay(); update(); @@ -92,4 +94,4 @@ public class Updater { _instance.notifyAll(); } } -} \ No newline at end of file +} diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java index 042cc433f..7de9b3397 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java @@ -19,6 +19,20 @@ import net.i2p.syndie.data.*; public class ArchiveServlet extends HttpServlet { public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + handle(req, resp); + } + + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + handle(req, resp); + } + public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + handle(req, resp); + } + public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + handle(req, resp); + } + + public void handle(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String path = req.getPathInfo(); if ( (path == null) || (path.trim().length() <= 1) ) { renderRootIndex(resp); diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java index 6e7f844bb..a586f5f7d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java @@ -28,6 +28,16 @@ public class ExportServlet extends HttpServlet { export(req, resp); } + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + export(req, resp); + } + public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + export(req, resp); + } + public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + export(req, resp); + } + public static void export(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { doExport(req, resp); diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java index 42acbfc36..f3a3e9052 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java @@ -152,7 +152,6 @@ public class PostServlet extends BaseServlet { out.write("To make changes, hit your browser's back arrow and try again.\n"); out.write("Remote archive to push this post to: "); out.write("
\n"); out.write("If you don't push this post remotely now, you can do so later on the syndicate screen "); diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 1cb7d7396..8978cfe31 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.46 $ $Date: 2005/10/14 08:48:04 $"; - public final static String VERSION = "0.6.1.4"; + public final static String ID = "$Revision: 1.47 $ $Date: 2005/10/29 18:20:05 $"; + public final static String VERSION = "0.6.1.5"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index 3e0c085c0..a509fc69b 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,6 @@ -$Id: history.txt,v 1.320 2005/11/12 00:03:54 jrandom Exp $ +$Id: history.txt,v 1.321 2005/11/14 19:24:36 jrandom Exp $ + +* 2005-11-15 0.6.1.5 released 2005-11-14 jrandom * Migrate to the new Syndie interface diff --git a/initialNews.xml b/initialNews.xml index c49f183d7..dbec61a43 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + i2p - 0.6.1.4 + 0.6.1.5 diff --git a/news.xml b/news.xml index 33eb5c195..341c6513b 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - +