From 106bccda0e0084d0b0ecd4a3180c8ab2232e376a Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 21 Apr 2010 17:41:14 +0000 Subject: [PATCH] log compress errors --- core/java/src/net/i2p/data/DataHelper.java | 8 +++++++- history.txt | 8 ++++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 0f80ffa67..c9cca505c 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -1054,7 +1054,13 @@ public class DataHelper { // * (((double) orig.length) / ((double) rv.length)) + "% savings)"); return rv; } catch (IOException ioe) { - //_log.error("Error compressing?!", ioe); + // Apache Harmony 5.0M13 + //java.io.IOException: attempt to write after finish + //at java.util.zip.DeflaterOutputStream.write(DeflaterOutputStream.java:181) + //at net.i2p.util.ResettableGZIPOutputStream.write(ResettableGZIPOutputStream.java:122) + //at net.i2p.data.DataHelper.compress(DataHelper.java:1048) + // ... + ioe.printStackTrace(); return null; } finally { ReusableGZIPOutputStream.release(out); diff --git a/history.txt b/history.txt index e14236e09..bdab6b3dc 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2010-04-21 zzz + * EepGet: Don't convert a MalformedURLException into + an IOE so we recognize it when it's throuwn + * ReusableGZIPStreams: + - Concurrent + - Workaround for Apache Harmony 5.0M13 Deflater bug + * TrustedUpdate: Increase buf size for extraction + 2010-04-18 zzz * configclients.jsp: Start button logic for clients was inverted * Console: IRC links in readmes and initialNews diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index affa6f41b..25340f779 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 14; + public final static long BUILD = 15; /** for example "-test" */ public final static String EXTRA = "-rc";