root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2009-02-13 09:11:03 +00:00
parent e58d036c73
commit ffb9625abf
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
View File

@ -17,6 +17,7 @@
package org.springframework.expression.spel.ast;
import org.antlr.runtime.Token;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.spel.ExpressionState;
import org.springframework.expression.spel.SpelException;
@ -42,9 +43,9 @@ public class Ternary extends SpelNodeImpl {
*/
@Override
public Object getValueInternal(ExpressionState state) throws EvaluationException {
Boolean b = getChild(0).getValue(state, Boolean.class);
Boolean value = getChild(0).getValue(state, Boolean.class);
try {
if (b != null && b.booleanValue()) {
if (Boolean.TRUE.equals(value)) {
return getChild(1).getValueInternal(state);
}
else {

6
org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -910,12 +910,12 @@ public abstract class AbstractFormController extends BaseCommandController {
* resetting the form (prepopulating it with the current values if "bindOnNewForm"
* is true). In this case, the form object in the session serves as transaction token.
* <pre class="code">
* protected ModelAndView handleInvalidSubmit(RenderRequest request, RenderResponse response) throws Exception {
* protected ModelAndView renderInvalidSubmit(RenderRequest request, RenderResponse response) throws Exception {
* return showNewForm(request, response);
* }</pre>
* You can also show a new form but with special errors registered on it:
* <pre class="code">
* protected ModelAndView handleInvalidSubmit(RenderRequest request, RenderResponse response) throws Exception {
* protected ModelAndView renderInvalidSubmit(RenderRequest request, RenderResponse response) throws Exception {
* BindException errors = getErrorsForNewForm(request);
* errors.reject("duplicateFormSubmission", "Duplicate form submission");
* return showForm(request, response, errors);