From 59af763dcdd80cdf82ab5dd2a64bed583bbf6fed Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 13 Dec 2010 15:28:06 +0000
Subject: [PATCH] do it the easy way

---
 .../i2p/router/web/ConfigUpdateHandler.java    | 18 +++++-------------
 core/java/src/net/i2p/util/FileUtil.java       |  3 ++-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
index 261fb4998..8a525180b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
@@ -3,6 +3,7 @@ package net.i2p.router.web;
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.TrustedUpdate;
 import net.i2p.data.DataHelper;
+import net.i2p.util.FileUtil;
 
 /**
  *
@@ -61,19 +62,10 @@ public class ConfigUpdateHandler extends FormHandler {
 
     public static final String DEFAULT_UPDATE_URL;
     static {
-        String foo;
-        try {
-            Class.forName("java.util.jar.Pack200", false, ClassLoader.getSystemClassLoader());
-            foo = PACK200_URLS;
-        } catch (ClassNotFoundException cnfe) {
-            try {
-                Class.forName("org.apache.harmony.unpack200.Archive", false, ClassLoader.getSystemClassLoader());
-                foo = PACK200_URLS;
-            } catch (ClassNotFoundException cnfe2) {
-                foo = NO_PACK200_URLS;
-            }
-        }
-        DEFAULT_UPDATE_URL = foo;
+        if (FileUtil.isPack200Supported())
+            DEFAULT_UPDATE_URL = PACK200_URLS;
+        else
+            DEFAULT_UPDATE_URL = NO_PACK200_URLS;
     }
 
     public static final String PROP_TRUSTED_KEYS = "router.trustedUpdateKeys";
diff --git a/core/java/src/net/i2p/util/FileUtil.java b/core/java/src/net/i2p/util/FileUtil.java
index 27ad846f3..b5bb48a43 100644
--- a/core/java/src/net/i2p/util/FileUtil.java
+++ b/core/java/src/net/i2p/util/FileUtil.java
@@ -231,9 +231,10 @@ public class FileUtil {
     }
     
     /**
+     * Public since 0.8.3
      * @since 0.8.1
      */
-    private static boolean isPack200Supported() {
+    public static boolean isPack200Supported() {
         try {
             Class.forName("java.util.jar.Pack200", false, ClassLoader.getSystemClassLoader());
             return true;