Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 63223 invoked from network); 11 Nov 2007 01:41:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Nov 2007 01:41:03 -0000 Received: (qmail 46221 invoked by uid 500); 11 Nov 2007 01:40:50 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 46178 invoked by uid 500); 11 Nov 2007 01:40:50 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 46169 invoked by uid 99); 11 Nov 2007 01:40:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Nov 2007 17:40:50 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Nov 2007 01:40:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 52F2C1A9832; Sat, 10 Nov 2007 17:40:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r593839 - /struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UelValueStack.java Date: Sun, 11 Nov 2007 01:40:39 -0000 To: commits@struts.apache.org From: tschneider@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071111014039.52F2C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tschneider Date: Sat Nov 10 17:40:38 2007 New Revision: 593839 URL: http://svn.apache.org/viewvc?rev=593839&view=rev Log: Added fallback to context lookup when a property isn't found Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UelValueStack.java Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UelValueStack.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UelValueStack.java?rev=593839&r1=593838&r2=593839&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UelValueStack.java (original) +++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UelValueStack.java Sat Nov 10 17:40:38 2007 @@ -53,6 +53,7 @@ } public Object findValue(String expr, Class asType) { + String originalExpression = expr; try { if (expr != null && expr.startsWith("#") && !expr.startsWith("#{")) { int firstDot = expr.indexOf('.'); @@ -66,9 +67,6 @@ return map.get(value); } } - if (context.get(expr) != null) { - return context.get(expr); - } if ((overrides != null) && overrides.containsKey(expr)) { expr = (String) overrides.get(expr); } @@ -91,6 +89,9 @@ } return retVal; } catch (PropertyNotFoundException e) { + if (context.containsKey(originalExpression)) { + return context.get(originalExpression); + } // property not found return null; } catch (ELException e) {