Author: aogburn Date: 2015-03-26 16:22:47 -0400 (Thu, 26 Mar 2015) New Revision: 2602 Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java Log: [JBPAPP-11217] merge fix Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml =================================================================== --- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml 2015-03-26 19:39:50 UTC (rev 2601) +++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/build.xml 2015-03-26 20:22:47 UTC (rev 2602) @@ -843,7 +843,7 @@ <target name="build-jasper-jdt-src"> <jar destfile="${jasper-jdt-src.jar}" index="true"> - <fileset dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model"> + <fileset dir="${jasper-jdt-src.home}/plugins/org.eclipse.jdt.core/model"> <include name="org/eclipse/jdt/core/compiler/**"/> <include name="org/eclipse/jdt/internal/compiler/**"/> <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/> Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java =================================================================== --- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java 2015-03-26 19:39:50 UTC (rev 2601) +++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java 2015-03-26 20:22:47 UTC (rev 2602) @@ -215,13 +215,17 @@ private void init() throws JasperException { if (!initialized) { - processWebDotXml(ctxt); - defaultJspProperty = new JspProperty(defaultIsXml, - defaultIsELIgnored, - defaultIsScriptingInvalid, - null, null, null, defaultDeferedSyntaxAllowedAsLiteral, - defaultTrimDirectiveWhitespaces); - initialized = true; + synchronized (this) { + if (!initialized) { + processWebDotXml(ctxt); + defaultJspProperty = new JspProperty(defaultIsXml, + defaultIsELIgnored, + defaultIsScriptingInvalid, + null, null, null, defaultDeferedSyntaxAllowedAsLiteral, + defaultTrimDirectiveWhitespaces); + initialized = true; + } + } } } Property changes on: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-11217/java/org/apache/jasper/compiler/JspConfig.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.1.x/java/org/apache/jasper/compiler/JspConfig.java:2600