You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2012/10/11 16:57:58 UTC

svn commit: r1397095 - in /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler: Compiler.java TagFileProcessor.java

Author: justin
Date: Thu Oct 11 14:57:57 2012
New Revision: 1397095

URL: http://svn.apache.org/viewvc?rev=1397095&view=rev
Log:
SLING-2618 - access defaultIsSession from Compiler via method access

Modified:
    sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
    sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java?rev=1397095&r1=1397094&r2=1397095&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java Thu Oct 11 14:57:57 2012
@@ -57,7 +57,7 @@ public abstract class Compiler {
 
     protected Node.Nodes pageNodes;
 
-    protected final boolean defaultIsSession;
+    private final boolean defaultIsSession;
 
     // ------------------------------------------------------------ Constructor
 
@@ -398,6 +398,10 @@ public abstract class Compiler {
         }
 
     }
+    
+    protected boolean getDefaultIsSession() {
+        return defaultIsSession;
+    }
 
     private static final class CleanVisitor extends Node.Visitor {
 

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java?rev=1397095&r1=1397094&r2=1397095&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java Thu Oct 11 14:57:57 2012
@@ -538,7 +538,7 @@ class TagFileProcessor {
         if (wrapper == null) {
             wrapper = new JspServletWrapper(ctxt.getServletContext(), ctxt
                     .getOptions(), tagFilePath, tagInfo, ctxt
-                    .getRuntimeContext(), compiler.defaultIsSession,
+                    .getRuntimeContext(), compiler.getDefaultIsSession(),
                      ctxt.getTagFileJarUrl(tagFilePath));
             wrapper = rctxt.addWrapper(tagFilePath, wrapper);
 
@@ -565,7 +565,7 @@ class TagFileProcessor {
                 JspServletWrapper tempWrapper = new JspServletWrapper(ctxt
                         .getServletContext(), ctxt.getOptions(),
                         tagFilePath, tagInfo, ctxt.getRuntimeContext(),
-                        compiler.defaultIsSession,
+                        compiler.getDefaultIsSession(),
                         ctxt.getTagFileJarUrl(tagFilePath));
                 tagClazz = tempWrapper.loadTagFilePrototype();
                 tempVector.add(tempWrapper.getJspEngineContext()