Fix test failure

2014-09-30 10:57:40 -04:00
parent 7aa3cc9bb2
commit 909156e1b6
1 changed files with 1 additions and 1 deletions
--- 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 @@ public class ViewResolverRegistry {


 	protected int getOrder() {
-		return this.order;
+		return (this.order != null ? this.order : Ordered.LOWEST_PRECEDENCE);
 	}

 	protected List<ViewResolver> getViewResolvers() {