← Back to branch summary

~james-page/ubuntu/natty/tomcat6/fix-662588

« back to all changes in this revision

Viewing changes to java/org/apache/jasper/compiler/ScriptingVariabler.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jasper/compiler/ScriptingVariabler.java
58
58
    static class ScriptingVariableVisitor extends Node.Visitor {
59
59
 
60
60
        private ErrorDispatcher err;
61
 
        private Hashtable scriptVars;
 
61
        private Map<String, Integer> scriptVars;
62
62
        
63
63
        public ScriptingVariableVisitor(ErrorDispatcher err) {
64
64
            this.err = err;
65
 
            scriptVars = new Hashtable();
 
65
            scriptVars = new HashMap<String, Integer>();
66
66
        }
67
67
 
68
68
        public void visit(Node.CustomTag n) throws JasperException {
69
69
            setScriptingVars(n, VariableInfo.AT_BEGIN);
70
70
            setScriptingVars(n, VariableInfo.NESTED);
71
 
            new ScriptingVariableVisitor(err).visitBody(n);
 
71
            visitBody(n);
72
72
            setScriptingVars(n, VariableInfo.AT_END);
73
73
        }
74
74
 
104
104
                    }
105
105
                    String varName = varInfos[i].getVarName();
106
106
                    
107
 
                    Integer currentRange = (Integer) scriptVars.get(varName);
 
107
                    Integer currentRange = scriptVars.get(varName);
108
108
                    if (currentRange == null
109
109
                            || ownRange.compareTo(currentRange) > 0) {
110
110
                        scriptVars.put(varName, ownRange);
127
127
                        }
128
128
                    }
129
129
 
130
 
                    Integer currentRange = (Integer) scriptVars.get(varName);
 
130
                    Integer currentRange = scriptVars.get(varName);
131
131
                    if (currentRange == null
132
132
                            || ownRange.compareTo(currentRange) > 0) {
133
133
                        scriptVars.put(varName, ownRange);