Commits

tm_jee  committed f7ffa2a

XW-411
- OgnlValueStack cannot handle mulitple overrides.
(apply Derek's patch + test cases)

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/xwork_1-2@1118e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 7358cdb
  • Branches xwork_1-2

Comments (0)

Files changed (2)

File src/java/com/opensymphony/xwork/util/OgnlValueStack.java

     }
 
     public void setExprOverrides(Map overrides) {
-        this.overrides = overrides;
+    	if (this.overrides == null) {
+    		this.overrides = overrides;
+    	}
+    	else {
+    		this.overrides.putAll(overrides);
+    	}
     }
 
     /**

File src/test/com/opensymphony/xwork/util/OgnlValueStackTest.java

 
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.test.TestBean2;
+import com.opensymphony.xwork.util.OgnlValueStack;
 
 import java.io.*;
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 
         return null;
     }
 
+    public void testExpOverridesCanStackExpUp() throws Exception {
+    	Map expr1 = new LinkedHashMap();
+    	expr1.put("expr1", "'expr1value'");
+    	
+    	OgnlValueStack vs = new OgnlValueStack();
+    	vs.setExprOverrides(expr1);
+    	
+    	assertEquals(vs.findValue("expr1"), "expr1value");
+    	
+    	Map expr2 = new LinkedHashMap();
+    	expr2.put("expr2", "'expr2value'");
+    	expr2.put("expr3", "'expr3value'");
+    	vs.setExprOverrides(expr2);
+    	
+    	assertEquals(vs.findValue("expr2"), "expr2value");
+    	assertEquals(vs.findValue("expr3"), "expr3value");
+    }
+    
     public void testArrayAsString() {
         OgnlValueStack vs = new OgnlValueStack();