From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 2 Oct 2010 18:53:30 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49985
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f49e3afdbc9e82c5d6df89c263d1aa5dcd4567ce;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49985
Make thread safe

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1003861 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/el/parser/AstFloatingPoint.java b/java/org/apache/el/parser/AstFloatingPoint.java
index 073abd4a1..9e402d5bb 100644
--- a/java/org/apache/el/parser/AstFloatingPoint.java
+++ b/java/org/apache/el/parser/AstFloatingPoint.java
@@ -34,7 +34,7 @@ public final class AstFloatingPoint extends SimpleNode {
         super(id);
     }
 
-    private Number number;
+    private volatile Number number;
 
     public Number getFloatingPoint() {
         if (this.number == null) {
diff --git a/java/org/apache/el/parser/AstInteger.java b/java/org/apache/el/parser/AstInteger.java
index a5f9268ab..a6f447a2a 100644
--- a/java/org/apache/el/parser/AstInteger.java
+++ b/java/org/apache/el/parser/AstInteger.java
@@ -34,7 +34,7 @@ public final class AstInteger extends SimpleNode {
         super(id);
     }
 
-    private Number number;
+    private volatile Number number;
 
     protected Number getInteger() {
         if (this.number == null) {
diff --git a/java/org/apache/el/parser/AstString.java b/java/org/apache/el/parser/AstString.java
index ffd1a1f4f..d77c7142d 100644
--- a/java/org/apache/el/parser/AstString.java
+++ b/java/org/apache/el/parser/AstString.java
@@ -32,7 +32,7 @@ public final class AstString extends SimpleNode {
         super(id);
     }
 
-    private String string;
+    private volatile String string;
 
     public String getString() {
         if (this.string == null) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 45f71495f..ac6ab063e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -269,6 +269,9 @@
         Catalina code as well as making it easier for Geronimo and others to
         integrate Jasper. Patch provided by David Jencks. (markt)
       </fix>
+      <fix>
+        <bug>49985</bug>: Fix thread safety issue in EL parser. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">