Commits

Anonymous committed 903b473

- changed Href tag to Anchor (a) tag
- changed continuation key from "continue" to "__continue" and now remove it so that it doesn't break devMode
- some various code formatting
- added Ant configuration to WebWork.ipr (i thought this was already there???)
- added behavior to the value stack to search in the context if nothing can be found
- various cleanup with the showcase app
- reran generated tag docs

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@714e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 2210c17

Comments (0)

Files changed (2)

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

                 return findValue(expr, defaultType);
             }
 
-            return OgnlUtil.getValue(expr, context, root);
+            Object value = OgnlUtil.getValue(expr, context, root);
+            if (value != null) {
+                return value;
+            } else {
+                return findInContext(expr);
+            }
         } catch (OgnlException e) {
-            return null;
+            return findInContext(expr);
         } catch (Exception e) {
             LOG.warn("Caught an exception while evaluating expression '" + expr + "' against value stack", e);
 
-            return null;
+            return findInContext(expr);
         } finally {
             OgnlContextState.clear(context);
         }
                 expr = (String) overrides.get(expr);
             }
 
-            return OgnlUtil.getValue(expr, context, root, asType);
+            Object value = OgnlUtil.getValue(expr, context, root, asType);
+            if (value != null) {
+                return value;
+            } else {
+                return findInContext(expr);
+            }
         } catch (OgnlException e) {
-            return null;
+            return findInContext(expr);
         } catch (Exception e) {
             LOG.warn("Caught an exception while evaluating expression '" + expr + "' against value stack", e);
 
-            return null;
+            return findInContext(expr);
         } finally {
             OgnlContextState.clear(context);
         }
     }
 
+    private Object findInContext(String name) {
+        return getContext().get(name);
+    }
+
     /**
      * Get the object on the top of the stack without changing the stack.
      *

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

  * Time: 7:39:30 AM
  */
 public class XWorkContinuationConfig extends ContinuationConfig {
-    public static final String CONTINUE_PARAM = "continue";
+    public static final String CONTINUE_PARAM = "__continue";
     public static final String CONTINUE_KEY = "__continue";
 
     public String getContinuableClassInternalName() {