Merge pull request #169 from marekkopecky/tomcat-exception

PaulLodge · web-flow · commit b9e5947e838b · 2023-09-13T08:28:15.000+02:00
Fix TomcatProperties class for EAP scenarios.
This fix will need to be revisited
diff --git a/core/src/main/groovy/noe/ews/server/tomcat/TomcatProperties.groovy b/core/src/main/groovy/noe/ews/server/tomcat/TomcatProperties.groovy
@@ -29,7 +29,7 @@ class TomcatProperties {
       } else  if (ewsVersion?.getMajorVersion() == 6) {
         TOMCAT_MAJOR_VERSION = "10"
       } else {
-        throw new IllegalArgumentException("Unknown EWS version ${ewsVersion?.getMajorVersion()}")
+        TOMCAT_MAJOR_VERSION = null
       }
     } else {
       TOMCAT_MAJOR_VERSION = tomcatVersion.getMajorVersion().toString()

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class TomcatProperties {`
`29`	`29`	`} else if (ewsVersion?.getMajorVersion() == 6) {`
`30`	`30`	`TOMCAT_MAJOR_VERSION = "10"`
`31`	`31`	`} else {`
`32`		`- throw new IllegalArgumentException("Unknown EWS version ${ewsVersion?.getMajorVersion()}")`
	`32`	`+ TOMCAT_MAJOR_VERSION = null`
`33`	`33`	`}`
`34`	`34`	`} else {`
`35`	`35`	`TOMCAT_MAJOR_VERSION = tomcatVersion.getMajorVersion().toString()`