Return-Path: 
 <dev-return-101820-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 39420 invoked from network); 7 Jan 2010 20:25:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 7 Jan 2010 20:25:21 -0000
Received: (qmail 83169 invoked by uid 500); 7 Jan 2010 20:25:20 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 83068 invoked by uid 500); 7 Jan 2010 20:25:20 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 83057 invoked by uid 99); 7 Jan 2010 20:25:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 20:25:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 20:25:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 717F823889B3; Thu,  7 Jan 2010 20:24:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r897005 - in /tomcat/trunk/test:
 org/apache/el/TestELInJsp.java
 webapp/el-misc.jsp
Date: Thu, 07 Jan 2010 20:24:58 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100107202459.717F823889B3@eris.apache.org>

Author: markt
Date: Thu Jan  7 20:24:57 2010
New Revision: 897005

URL: http://svn.apache.org/viewvc?rev=897005&view=rev
Log:
Add another edge case

Modified:
    tomcat/trunk/test/org/apache/el/TestELInJsp.java
    tomcat/trunk/test/webapp/el-misc.jsp

Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=897005&r1=897004&r2=897005&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Thu Jan  7 20:24:57 2010
@@ -277,6 +277,7 @@
         assertTrue(result.indexOf("08-a2z") > 0);
         assertTrue(result.indexOf("09-az2") > 0);
         assertTrue(result.indexOf("10-${'foo'}bar") > 0);
+        assertTrue(result.indexOf("11-\"}") > 0);
     }
 
 

Modified: tomcat/trunk/test/webapp/el-misc.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/el-misc.jsp?rev=897005&r1=897004&r2=897005&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/el-misc.jsp (original)
+++ tomcat/trunk/test/webapp/el-misc.jsp Thu Jan  7 20:24:57 2010
@@ -29,5 +29,6 @@
     <tags:echo echo="08-a${\"2\"}z" />
     <tags:echo echo="09-az${\"2\"}" />
     <tags:echo echo="10-\${'foo'}${'bar'}" />
+    <tags:echo echo="11-${\"\\\"}\"}" />
   </body>
 </html>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org