Return-Path: Delivered-To: apmail-hivemind-commits-archive@www.apache.org Received: (qmail 53077 invoked from network); 28 Jul 2006 08:34:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Jul 2006 08:34:52 -0000 Received: (qmail 71592 invoked by uid 500); 28 Jul 2006 08:34:47 -0000 Delivered-To: apmail-hivemind-commits-archive@hivemind.apache.org Received: (qmail 71581 invoked by uid 500); 28 Jul 2006 08:34:47 -0000 Mailing-List: contact commits-help@hivemind.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hivemind.apache.org Delivered-To: mailing list commits@hivemind.apache.org Received: (qmail 71564 invoked by uid 99); 28 Jul 2006 08:34:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2006 01:34:47 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2006 01:34:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 401FE1A981A; Fri, 28 Jul 2006 01:34:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r426434 - in /hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl: ClassFactoryClassLoader.java HiveMindClassPool.java Date: Fri, 28 Jul 2006 08:34:25 -0000 To: commits@hivemind.apache.org From: knut@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060728083426.401FE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: knut Date: Fri Jul 28 01:34:25 2006 New Revision: 426434 URL: http://svn.apache.org/viewvc?rev=426434&view=rev Log: Explicitly include the classloader used to load the HiveMind classes in the classloader hierarchy used by ClassFactory (through HiveMindClassPool) Modified: hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/ClassFactoryClassLoader.java hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java Modified: hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/ClassFactoryClassLoader.java URL: http://svn.apache.org/viewvc/hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/ClassFactoryClassLoader.java?rev=426434&r1=426433&r2=426434&view=diff ============================================================================== --- hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/ClassFactoryClassLoader.java (original) +++ hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/ClassFactoryClassLoader.java Fri Jul 28 01:34:25 2006 @@ -27,6 +27,11 @@ { private List _loaders = new ArrayList(); + public ClassFactoryClassLoader(ClassLoader parent) + { + super(parent); + } + /** * Adds a delegate class loader to the list of delegate class loaders. */ @@ -40,17 +45,6 @@ */ protected synchronized Class findClass(String name) throws ClassNotFoundException { - ClassNotFoundException cnfex = null; - - try - { - return super.findClass(name); - } - catch (ClassNotFoundException ex) - { - cnfex = ex; - } - int count = _loaders.size(); for (int i = 0; i < count; i++) { @@ -66,9 +60,7 @@ } } - // Not found .. through the first exception - - throw cnfex; + throw new ClassNotFoundException(name); } } Modified: hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java URL: http://svn.apache.org/viewvc/hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java?rev=426434&r1=426433&r2=426434&view=diff ============================================================================== --- hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java (original) +++ hivemind/branches/branch-1-1/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java Fri Jul 28 01:34:25 2006 @@ -32,7 +32,8 @@ */ public class HiveMindClassPool extends ClassPool { - private ClassFactoryClassLoader _loader = new ClassFactoryClassLoader(); + private ClassFactoryClassLoader _loader = new ClassFactoryClassLoader(HiveMindClassPool.class + .getClassLoader()); /** * Used to identify which class loaders have already been integrated into the pool.