Fix test failure

rstoyanchev · rstoyanchev · commit 909156e1b6c1 · 2014-09-30T10:57:40.000-04:00
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
@@ -280,7 +280,7 @@ protected boolean hasBeanOfType(Class<?> beanType) {
 
 
 	protected int getOrder() {
-		return this.order;
+		return (this.order != null ? this.order : Ordered.LOWEST_PRECEDENCE);
 	}
 
 	protected List<ViewResolver> getViewResolvers() {

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ protected boolean hasBeanOfType(Class<?> beanType) {`
`280`	`280`
`281`	`281`
`282`	`282`	`protected int getOrder() {`
`283`		`- return this.order;`
	`283`	`+ return (this.order != null ? this.order : Ordered.LOWEST_PRECEDENCE);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`protected List<ViewResolver> getViewResolvers() {`