Change semantics of @CrossOrigin's maxAge regarding negative values

This commit is contained in:
Sam Brannen
2015-05-31 18:20:52 +02:00
parent 72b44af862
commit f0c0813011
2 changed files with 3 additions and 2 deletions

View File

@@ -340,7 +340,8 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
throw new IllegalStateException("@CrossOrigin's allowCredentials value must be \"true\", \"false\", "
+ "or an empty string (\"\"); current value is [" + allowCredentials + "].");
}
if (annotation.maxAge() != -1 && config.getMaxAge() == null) {
if ((annotation.maxAge() >= 0) && (config.getMaxAge() == null)) {
config.setMaxAge(annotation.maxAge());
}
}