Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 59497 invoked from network); 16 Dec 2004 10:36:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 16 Dec 2004 10:36:59 -0000 Received: (qmail 82035 invoked by uid 500); 16 Dec 2004 10:36:58 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 81979 invoked by uid 500); 16 Dec 2004 10:36:58 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 81967 invoked by uid 99); 16 Dec 2004 10:36:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 16 Dec 2004 02:34:54 -0800 Received: (qmail 58069 invoked by uid 65534); 16 Dec 2004 10:34:30 -0000 Date: 16 Dec 2004 10:34:30 -0000 Message-ID: <20041216103430.58062.qmail@minotaur.apache.org> From: reinhard@apache.org To: cvs@cocoon.apache.org Subject: svn commit: r122541 - /cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: reinhard Date: Thu Dec 16 02:34:29 2004 New Revision: 122541 URL: http://svn.apache.org/viewcvs?view=rev&rev=122541 Log: Use new CompilingClassloader in Flowscript too Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?view=diff&rev=122541&p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java&r1=122540&p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java&r2=122541 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Thu Dec 16 02:34:29 2004 @@ -298,41 +298,6 @@ } } - private ClassLoader getClassLoader(boolean needsRefresh) throws Exception { - if (!reloadScripts) { - return Thread.currentThread().getContextClassLoader(); - } - - synchronized (javaClassRepository) { - boolean reload = needsRefresh || classLoader == null; - if (needsRefresh && classLoader != null) { - reload = !javaClassRepository.upToDateCheck(); - } - - if (reload) { - // FIXME FIXME FIXME Resolver not released! - classLoader = new CompilingClassLoader( - Thread.currentThread().getContextClassLoader(), - (SourceResolver) manager.lookup(SourceResolver.ROLE), - javaClassRepository); - classLoader.addSourceListener( - new CompilingClassLoader.SourceListener() { - public void sourceCompiled(Source src) { - // no action - } - - public void sourceCompilationError(Source src, String msg) { - if (src != null) { - throw Context.reportRuntimeError(msg); - } - } - }); - updateSourcePath(); - } - return classLoader; - } - } - private void updateSourcePath() { if (classLoader != null) { classLoader.setSourcePath(javaSourcePath); @@ -562,9 +527,7 @@ // We need to setup the FOM_Cocoon object according to the current // request. Everything else remains the same. - ClassLoader classLoader = getClassLoader(needsRefresh); - Thread.currentThread().setContextClassLoader(classLoader); - thrScope.setupPackages(classLoader); + thrScope.setupPackages(Thread.currentThread().getContextClassLoader()); cocoon.pushCallContext(this, redirector, manager, avalonContext, getLogger(), null);