This is an automated email from the ASF dual-hosted git repository. bross pushed a commit to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git
commit d87183fb7ce90eb2ab3651ae5156a5e930c18110 Author: Sarah <sab...@pivotal.io> AuthorDate: Fri Apr 9 11:35:23 2021 -0400 Revert "GEODE-7896 Update tomcat support (#6289)" This reverts commit bc05e41217cd06197d566ac055d10216efae95df. --- .../gradle/plugins/DependencyConstraints.groovy | 2 +- .../modules/session/catalina/DeltaSession.java | 24 +--------------------- .../apache/geode/session/tests/TomcatInstall.java | 2 +- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index c5c9d42..c6758c5 100644 --- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -53,7 +53,7 @@ class DependencyConstraints implements Plugin<Project> { deps.put("tomcat6.version", "6.0.37") deps.put("tomcat7.version", "7.0.96") deps.put("tomcat8.version", "8.5.46") - deps.put("tomcat9.version", "9.0.33") + deps.put("tomcat9.version", "9.0.12") // The jetty version is also hard-coded in geode-assembly:test // at o.a.g.sessions.tests.GenericAppServerInstall.java diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java index 4e5e969..aa8b3f5 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java @@ -366,29 +366,7 @@ public class DeltaSession extends StandardSession @Override public void localUpdateAttribute(String name, Object value) { - if (this.manager == null) { - // Name cannot be null - if (name == null) { - throw new IllegalArgumentException(sm.getString("standardSession.setAttribute.namenull")); - } - - // Null value is the same as removeAttribute() - if (value == null) { - removeAttribute(name); - return; - } - - // Validate our current state - if (!isValidInternal()) { - throw new IllegalStateException( - sm.getString("standardSession.setAttribute.ise", getIdInternal())); - } - - // Replace or add this attribute - getAttributes().put(name, value); - } else { - super.setAttribute(name, value, false); // don't do notification since this is a replication - } + super.setAttribute(name, value, false); // don't do notification since this is a replication } @Override diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java index 572fa20..a7da1ff 100644 --- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java +++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java @@ -43,7 +43,7 @@ public class TomcatInstall extends ContainerInstall { TOMCAT6(6, "tomcat-6.0.37.zip"), TOMCAT7(7, "tomcat-7.0.96.zip"), TOMCAT8(8, "tomcat-8.5.46.zip"), - TOMCAT9(9, "tomcat-9.0.33.zip"); + TOMCAT9(9, "tomcat-9.0.12.zip"); private final int version;