Better error message

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

diff --git a/java/org/apache/el/parser/AstDotSuffix.java b/java/org/apache/el/parser/AstDotSuffix.java
index 5e964f1..0463b5a 100644 (file)
--- a/java/org/apache/el/parser/AstDotSuffix.java
+++ b/java/org/apache/el/parser/AstDotSuffix.java
@@ -42,7 +42,8 @@ public final class AstDotSuffix extends SimpleNode {
     @Override
     public void setImage(String image) {
         if (!Validation.isIdentifier(image)) {
-            throw new ELException("Can't use Java keyword as identifier");
+            throw new ELException("[" + image +
+                    "] is not a valid Java identifier");
         }
         this.image = image;
     }

diff --git a/java/org/apache/el/parser/AstIdentifier.java b/java/org/apache/el/parser/AstIdentifier.java
index d4c477a..de7f360 100644 (file)
--- a/java/org/apache/el/parser/AstIdentifier.java
+++ b/java/org/apache/el/parser/AstIdentifier.java
@@ -129,7 +129,8 @@ public final class AstIdentifier extends SimpleNode {
     @Override
     public void setImage(String image) {
         if (!Validation.isIdentifier(image)) {
-            throw new ELException("Can't use Java keyword as identifier");
+            throw new ELException("[" + image +
+                    "] is not a valid Java identifier");
         }
         this.image = image;
     }