Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 52892 invoked from network); 6 Apr 2010 16:05:35 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Apr 2010 16:05:35 -0000 Received: (qmail 16155 invoked by uid 500); 6 Apr 2010 16:05:35 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 16094 invoked by uid 500); 6 Apr 2010 16:05:35 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 16087 invoked by uid 99); 6 Apr 2010 16:05:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Apr 2010 16:05:35 +0000 X-ASF-Spam-Status: No, hits=-1204.6 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Apr 2010 16:05:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4DEAD238898B; Tue, 6 Apr 2010 16:05:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r931205 - /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java Date: Tue, 06 Apr 2010 16:05:14 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100406160514.4DEAD238898B@eris.apache.org> Author: cziegeler Date: Tue Apr 6 16:05:13 2010 New Revision: 931205 URL: http://svn.apache.org/viewvc?rev=931205&view=rev Log: (empty) Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java?rev=931205&r1=931204&r2=931205&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java (original) +++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java Tue Apr 6 16:05:13 2010 @@ -158,7 +158,8 @@ public class JspScriptEngineFactory if ( resolver == null ) { resolver = scriptHelper.getScript().getScriptResource().getResourceResolver(); } - ioProvider.setRequestResourceResolver(resolver); + final SlingIOProvider io = this.ioProvider; + io.setRequestResourceResolver(resolver); try { final JspServletWrapperAdapter jsp = getJspWrapperAdapter(scriptHelper); // create a SlingBindings object @@ -166,7 +167,7 @@ public class JspScriptEngineFactory slingBindings.putAll(bindings); jsp.service(slingBindings); } finally { - ioProvider.resetRequestResourceResolver(); + io.resetRequestResourceResolver(); } }