From b8dea83bcebdbfc76d248980b3a141e34a42a2e0 Mon Sep 17 00:00:00 2001 From: hns Date: Wed, 9 Jul 2003 15:15:28 +0000 Subject: [PATCH] Patch by Stefan Matthias Aust: Handle case where Helma classes are not packed in jar file. --- src/helma/framework/core/TypeManager.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/helma/framework/core/TypeManager.java b/src/helma/framework/core/TypeManager.java index c445c021..e4ca1113 100644 --- a/src/helma/framework/core/TypeManager.java +++ b/src/helma/framework/core/TypeManager.java @@ -87,16 +87,18 @@ public final class TypeManager { zipfiles = new HashMap(); jarfiles = new HashSet(); - URL[] urls = ((URLClassLoader) TypeManager.class.getClassLoader()).getURLs(); - URL helmajar = null; + URL helmajar = TypeManager.class.getResource("/"); - for (int i = 0; i < urls.length; i++) { - String url = urls[i].toString().toLowerCase(); + if (helmajar == null) { + // Helma classes are in jar file, get helma.jar URL + URL[] urls = ((URLClassLoader) TypeManager.class.getClassLoader()).getURLs(); - if (url.endsWith("helma.jar")) { - helmajar = urls[i]; - - break; + for (int i = 0; i < urls.length; i++) { + String url = urls[i].toString().toLowerCase(); + if (url.endsWith("helma.jar")) { + helmajar = urls[i]; + break; + } } }