Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid potential NPE (SPR-6300)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-11-12 13:42:07 +00:00
parent 6ee17d2826
commit 613b4d182b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.test/src/main/java/org/springframework/test/web/ModelAndViewAssert.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.springframework.util.ObjectUtils;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
/** /**
@@ -180,8 +181,8 @@ public abstract class ModelAndViewAssert {
*/ */
public static void assertViewName(ModelAndView mav, String expectedName) { public static void assertViewName(ModelAndView mav, String expectedName) {
assertCondition(mav != null, "ModelAndView is null"); assertCondition(mav != null, "ModelAndView is null");
assertCondition(expectedName.equals(mav.getViewName()), "View name is not equal to '" + expectedName + assertCondition(ObjectUtils.nullSafeEquals(expectedName, mav.getViewName()),
"' but was '" + mav.getViewName() + "'"); "View name is not equal to '" + expectedName + "' but was '" + mav.getViewName() + "'");
} }