Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 41175 invoked from network); 10 May 2007 15:46:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 May 2007 15:46:09 -0000 Received: (qmail 46155 invoked by uid 500); 10 May 2007 15:46:15 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 46116 invoked by uid 500); 10 May 2007 15:46:15 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 46096 invoked by uid 99); 10 May 2007 15:46:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 08:46:15 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 08:46:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BBAF51A9838; Thu, 10 May 2007 08:45:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r536890 - /geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java Date: Thu, 10 May 2007 15:45:46 -0000 To: scm@geronimo.apache.org From: hogstrom@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070510154547.BBAF51A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hogstrom Date: Thu May 10 08:45:42 2007 New Revision: 536890 URL: http://svn.apache.org/viewvc?view=rev&rev=536890 Log: Modified ClassLoader behaviour to only use JarFile ClassLoader if specifically requested. If not specifically requested we'll only use it on Windows for now given the slight performance penalty. Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java?view=diff&rev=536890&r1=536889&r2=536890 ============================================================================== --- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java (original) +++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java Thu May 10 08:45:42 2007 @@ -361,15 +361,25 @@ log.debug(buf.toString()); } - if (Boolean.getBoolean("Xorg.apache.geronimo.OldClassLoader")) { - return new MultiParentClassLoader(environment.getConfigId(), + // The JarFileClassLoader was created to address a locking problem seen only on Windows platforms. + // It carries with it a slight performance penalty that needs to be addressed. Rather than make + // *nix OSes carry this burden we'll engage the JarFileClassLoader for Windows or if the user + // specifically requests it. We'll look more at this issue in the future. + boolean useJarFileClassLoader = false; + if (System.getProperty("Xorg.apache.geronimo.JarFileClassLoader") == null) { + useJarFileClassLoader = System.getProperty("os.name").startsWith("Windows"); + } else { + useJarFileClassLoader = Boolean.getBoolean("Xorg.apache.geronimo.JarFileClassLoader"); + } + if (useJarFileClassLoader) { + return new JarFileClassLoader(environment.getConfigId(), urls, parentClassLoaders, environment.isInverseClassLoading(), hiddenClasses, nonOverridableClasses); } else { - return new JarFileClassLoader(environment.getConfigId(), + return new MultiParentClassLoader(environment.getConfigId(), urls, parentClassLoaders, environment.isInverseClassLoading(),