From 909156e1b6c128242298da77412ebfd831cfbca9 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Tue, 30 Sep 2014 10:57:40 -0400
Subject: [PATCH] Fix test failure

---
 .../web/servlet/config/annotation/ViewResolverRegistry.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f70650bd0d..a512521966 100644
--- 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() {