diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java index b7e2717067d..5a01641866f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java @@ -25,6 +25,7 @@ import javax.xml.transform.stream.StreamResult; import org.springframework.oxm.Marshaller; import org.springframework.util.Assert; import org.springframework.util.StreamUtils; +import org.springframework.validation.BindingResult; import org.springframework.web.servlet.View; import org.springframework.web.servlet.view.AbstractView; @@ -38,6 +39,7 @@ import org.springframework.web.servlet.view.AbstractView; * property or have Spring locate the Source object. * * @author Arjen Poutsma + * @author Juergen Hoeller * @since 3.0 */ public class MarshallingView extends AbstractView { @@ -67,7 +69,8 @@ public class MarshallingView extends AbstractView { */ public MarshallingView(Marshaller marshaller) { this(); - setMarshaller(marshaller); + Assert.notNull(marshaller, "Marshaller must not be null"); + this.marshaller = marshaller; } @@ -75,7 +78,6 @@ public class MarshallingView extends AbstractView { * Sets the {@link Marshaller} to be used by this view. */ public void setMarshaller(Marshaller marshaller) { - Assert.notNull(marshaller, "Marshaller must not be null"); this.marshaller = marshaller; } @@ -112,9 +114,10 @@ public class MarshallingView extends AbstractView { } /** - * Locates the object to be marshalled. The default implementation first attempts to look - * under the configured {@linkplain #setModelKey(String) model key}, if any, before attempting - * to locate an object of {@linkplain Marshaller#supports(Class) supported type}. + * Locate the object to be marshalled. + *
The default implementation first attempts to look under the configured
+ * {@linkplain #setModelKey(String) model key}, if any, before attempting to
+ * locate an object of {@linkplain Marshaller#supports(Class) supported type}.
* @param model the model Map
* @return the Object to be marshalled (or {@code null} if none found)
* @throws IllegalStateException if the model object specified by the
@@ -134,7 +137,8 @@ public class MarshallingView extends AbstractView {
return obj;
}
for (Object obj : model.values()) {
- if (obj != null && this.marshaller.supports(obj.getClass())) {
+ if (obj != null && (model.size() == 1 || !(obj instanceof BindingResult)) &&
+ this.marshaller.supports(obj.getClass())) {
return obj;
}
}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
index 4b6cddcda60..39e58a96efa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
@@ -17,6 +17,7 @@
package org.springframework.web.servlet.view.xml;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import javax.xml.transform.stream.StreamResult;
@@ -26,6 +27,8 @@ import org.junit.Test;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse;
import org.springframework.oxm.Marshaller;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
@@ -35,9 +38,10 @@ import static org.mockito.BDDMockito.*;
*/
public class MarshallingViewTests {
+ private Marshaller marshallerMock;
+
private MarshallingView view;
- private Marshaller marshallerMock;
@Before
public void createView() throws Exception {
@@ -45,6 +49,7 @@ public class MarshallingViewTests {
view = new MarshallingView(marshallerMock);
}
+
@Test
public void getContentType() {
assertEquals("Invalid content type", "application/xml", view.getContentType());
@@ -159,6 +164,26 @@ public class MarshallingViewTests {
verify(marshallerMock).marshal(eq(toBeMarshalled), isA(StreamResult.class));
}
+ @Test
+ public void renderNoModelKeyAndBindingResultFirst() throws Exception {
+ Object toBeMarshalled = new Object();
+ String modelKey = "key";
+ Map