Merge pull request #12691 from maiconandsilva/5.2.x

puneetbehl · web-flow · commit 4f258f60c4e4 · 2022-09-14T08:34:29.000+05:30
Fix NullPointerException when servlet version is not set (#12690)
diff --git a/grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy b/grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy
@@ -281,7 +281,7 @@ class Metadata extends PropertySourcePropertyResolver {
     String getServletVersion() {
         Optional<String> servletVersion = ((PropertyResolver) this).getProperty(SERVLET_VERSION, String.class)
         if (!servletVersion.isPresent()) {
-            servletVersion = Optional.of(System.getProperty(SERVLET_VERSION))
+            servletVersion = Optional.ofNullable(System.getProperty(SERVLET_VERSION))
         }
         servletVersion.orElse(DEFAULT_SERVLET_VERSION)
     }

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ class Metadata extends PropertySourcePropertyResolver {`
`281`	`281`	`String getServletVersion() {`
`282`	`282`	`Optional<String> servletVersion = ((PropertyResolver) this).getProperty(SERVLET_VERSION, String.class)`
`283`	`283`	`if (!servletVersion.isPresent()) {`
`284`		`- servletVersion = Optional.of(System.getProperty(SERVLET_VERSION))`
	`284`	`+ servletVersion = Optional.ofNullable(System.getProperty(SERVLET_VERSION))`
`285`	`285`	`}`
`286`	`286`	`servletVersion.orElse(DEFAULT_SERVLET_VERSION)`
`287`	`287`	`}`