You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2021/04/13 14:28:11 UTC
[geode] 01/11: Revert "GEODE-8684: Setting a session's
maxInactiveInterval does not work when the commit valve is disabled"
This is an automated email from the ASF dual-hosted git repository.
sabbey37 pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ccdb502dd7f94aecaa75cbace114518ce0ff09bc
Author: Sarah <sa...@pivotal.io>
AuthorDate: Mon Apr 12 09:22:03 2021 -0400
Revert "GEODE-8684: Setting a session's maxInactiveInterval does not work when the commit valve is disabled"
This reverts commit cab4bcfd8d95c2d70ca40ad50e2beb761c798ca0.
---
.../modules/session/catalina/DeltaSession.java | 4 ---
.../geode/session/tests/TomcatContainer.java | 15 ++++-----
.../apache/geode/session/tests/TomcatInstall.java | 36 ++--------------------
.../apache/geode/session/tests/CargoTestBase.java | 9 +++---
.../tests/Tomcat6CachingClientServerTest.java | 2 +-
.../session/tests/Tomcat6ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat6Test.java | 3 +-
.../tests/Tomcat7CachingClientServerTest.java | 2 +-
.../session/tests/Tomcat7ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat7Test.java | 3 +-
.../tests/Tomcat8CachingClientServerTest.java | 2 +-
.../session/tests/Tomcat8ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat8Test.java | 3 +-
.../tests/Tomcat9CachingClientServerTest.java | 2 +-
...omcat9CachingClientServerValveDisabledTest.java | 28 -----------------
.../session/tests/Tomcat9ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat9Test.java | 3 +-
.../Tomcat8ClientServerRollingUpgradeTest.java | 4 +--
...omcatSessionBackwardsCompatibilityTestBase.java | 8 ++---
19 files changed, 34 insertions(+), 102 deletions(-)
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 3d9e627..4e5e969 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
@@ -362,10 +362,6 @@ public class DeltaSession extends StandardSession
@Override
public void setMaxInactiveInterval(int interval) {
super.setMaxInactiveInterval(interval);
-
- if (!isCommitEnabled() && id != null) {
- putInRegion(getOperatingRegion(), true, null);
- }
}
@Override
diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
index b0d4168..38d262d 100644
--- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
+++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
@@ -65,16 +65,17 @@ public class TomcatContainer extends ServerContainer {
setConfigFile(contextXMLFile.getAbsolutePath(), DEFAULT_TOMCAT_XML_REPLACEMENT_DIR,
DEFAULT_TOMCAT_CONTEXT_XML_REPLACEMENT_NAME);
- if (install.getConnectionType() == ContainerInstall.ConnectionType.CLIENT_SERVER ||
- install.getConnectionType() == ContainerInstall.ConnectionType.CACHING_CLIENT_SERVER) {
+ if (install.getConnectionType() == ContainerInstall.ConnectionType.CLIENT_SERVER) {
+ // using proxy region, override the default client/server setting to set to false
setCacheProperty("enableLocalCache",
String.valueOf(install.getConnectionType().enableLocalCache()));
+ } else {
+ // using default, either setting it explicitly or leave it off should have the same effect
+ if (System.currentTimeMillis() % 2 == 0) {
+ setCacheProperty("enableLocalCache",
+ String.valueOf(install.getConnectionType().enableLocalCache()));
+ }
}
-
- if (install.getCommitValve() != TomcatInstall.CommitValve.DEFAULT) {
- setCacheProperty("enableCommitValve", install.getCommitValve().getValue());
- }
-
setCacheProperty("className", install.getContextSessionManagerClass());
// Deploy war file to container configuration
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 af7d955..322558e 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
@@ -89,26 +89,6 @@ public class TomcatInstall extends ContainerInstall {
}
/**
- * This determines the setting for 'enableCommitValve' in Tomcat's context.xml when configuring
- * the DeltaSessionManager.
- */
- public enum CommitValve {
- ENABLED("true"),
- DISABLED("false"),
- DEFAULT(null);
-
- private final String value;
-
- CommitValve(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
- }
-
- /**
* If you update this list method to return different dependencies, please also update the Tomcat
* module documentation! The documentation can be found here:
* geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
@@ -123,14 +103,11 @@ public class TomcatInstall extends ContainerInstall {
private final TomcatVersion version;
- private final CommitValve commitValve;
-
public TomcatInstall(String name, TomcatVersion version, ConnectionType connectionType,
- IntSupplier portSupplier,
- CommitValve commitValve)
+ IntSupplier portSupplier)
throws Exception {
this(name, version, connectionType, DEFAULT_MODULE_LOCATION, GEODE_BUILD_HOME_LIB,
- portSupplier, commitValve);
+ portSupplier);
}
/**
@@ -143,14 +120,12 @@ public class TomcatInstall extends ContainerInstall {
* skipping properties needed to speedup container startup.
*/
public TomcatInstall(String name, TomcatVersion version, ConnectionType connType,
- String modulesJarLocation, String extraJarsPath, IntSupplier portSupplier,
- CommitValve commitValve)
+ String modulesJarLocation, String extraJarsPath, IntSupplier portSupplier)
throws Exception {
// Does download and install from URL
super(name, version.getDownloadURL(), connType, "tomcat", modulesJarLocation, portSupplier);
this.version = version;
- this.commitValve = commitValve;
modulesJarLocation = getModulePath() + "/lib/";
// Install geode sessions into tomcat install
@@ -266,10 +241,6 @@ public class TomcatInstall extends ContainerInstall {
return version.name() + "_" + getConnectionType().getName();
}
- public CommitValve getCommitValve() {
- return commitValve;
- }
-
/**
* Copies jars specified by {@link #tomcatRequiredJars} from the {@link #getModulePath()} and the
* specified other directory passed to the function
@@ -344,5 +315,4 @@ public class TomcatInstall extends ContainerInstall {
editPropertyFile(getHome() + "/conf/catalina.properties", version.jarSkipPropertyName(),
jarsToSkip, true);
}
-
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
index 8e95e1d..4ef5c78 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
@@ -23,7 +23,6 @@ import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.concurrent.TimeUnit;
import java.util.function.IntSupplier;
import org.apache.logging.log4j.Logger;
@@ -34,6 +33,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.UniquePortSupplier;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.modules.session.functions.GetMaxInactiveInterval;
@@ -81,7 +81,8 @@ public abstract class CargoTestBase {
public void setup() throws Exception {
dumpDockerInfo();
announceTest("START");
- locatorVM = clusterStartupRule.startLocatorVM(0);
+ int locatorPortSuggestion = AvailablePortHelper.getRandomAvailableTCPPort();
+ locatorVM = clusterStartupRule.startLocatorVM(0, locatorPortSuggestion);
client = new Client();
manager = new ContainerManager();
@@ -251,7 +252,7 @@ public abstract class CargoTestBase {
client.setMaxInactive(1); // max inactive time is 1 second. Lets wait a second.
Thread.sleep(2000);
- await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+ await().untilAsserted(() -> {
verifySessionIsRemoved(key);
Thread.sleep(1000);
});
@@ -284,7 +285,7 @@ public abstract class CargoTestBase {
for (int i = 0; i < manager.numContainers(); i++) {
client.setPort(Integer.parseInt(manager.getContainerPort(i)));
if (install.getConnectionType() == ContainerInstall.ConnectionType.CACHING_CLIENT_SERVER) {
- await().atMost(30, TimeUnit.SECONDS).until(() -> Integer.toString(expected)
+ await().until(() -> Integer.toString(expected)
.equals(client.executionFunction(GetMaxInactiveInterval.class).getResponse()));
} else {
assertEquals(Integer.toString(expected),
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java
index 1c6f9d0..3bd14ee 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat6CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, CACHING_CLIENT_SERVER,
- portSupplier, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
index 75d853d..1924034 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
@@ -22,7 +22,6 @@ import java.util.function.IntSupplier;
public class Tomcat6ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, CLIENT_SERVER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, CLIENT_SERVER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
index 50487d0..60dface 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
@@ -22,7 +22,6 @@ import java.util.function.IntSupplier;
public class Tomcat6Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, PEER_TO_PEER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, PEER_TO_PEER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java
index 4401bfe..c2db978 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat7CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, CACHING_CLIENT_SERVER,
- portSupplier, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
index f2cacf5..5c39fd2 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
@@ -23,7 +23,6 @@ import java.util.function.IntSupplier;
public class Tomcat7ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, CLIENT_SERVER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, CLIENT_SERVER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
index 5e93e1f..1922fdb 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
@@ -22,7 +22,6 @@ import java.util.function.IntSupplier;
public class Tomcat7Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, PEER_TO_PEER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, PEER_TO_PEER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java
index ca3e921..03b65df 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat8CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, CACHING_CLIENT_SERVER,
- portSupplier, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
index f52eacc..a4e960d 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
@@ -22,7 +22,6 @@ import java.util.function.IntSupplier;
public class Tomcat8ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, CLIENT_SERVER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, CLIENT_SERVER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
index dba0402..93a7441 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
@@ -22,7 +22,6 @@ import java.util.function.IntSupplier;
public class Tomcat8Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, PEER_TO_PEER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, PEER_TO_PEER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
index a02376c..8e8b4c4 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat9CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CACHING_CLIENT_SERVER,
- portSupplier, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerValveDisabledTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerValveDisabledTest.java
deleted file mode 100644
index 3738d9c..0000000
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerValveDisabledTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.session.tests;
-
-import static org.apache.geode.session.tests.ContainerInstall.ConnectionType.CACHING_CLIENT_SERVER;
-import static org.apache.geode.session.tests.TomcatInstall.TomcatVersion.TOMCAT9;
-
-import java.util.function.IntSupplier;
-
-public class Tomcat9CachingClientServerValveDisabledTest extends TomcatClientServerTest {
- @Override
- public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CACHING_CLIENT_SERVER,
- portSupplier, TomcatInstall.CommitValve.DISABLED);
- }
-}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java
index f922d2b..a617e19 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java
@@ -23,7 +23,6 @@ public class Tomcat9ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CLIENT_SERVER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CLIENT_SERVER, portSupplier);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java
index cb65d56..b7777d1 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java
@@ -22,7 +22,6 @@ import java.util.function.IntSupplier;
public class Tomcat9Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, PEER_TO_PEER, portSupplier,
- TomcatInstall.CommitValve.DEFAULT);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, PEER_TO_PEER, portSupplier);
}
}
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
index be78750..ec6c39c 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -136,12 +136,12 @@ public class Tomcat8ClientServerRollingUpgradeTest {
ContainerInstall.ConnectionType.CLIENT_SERVER,
oldModules.getAbsolutePath(),
oldBuild.getAbsolutePath() + "/lib",
- portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier::getAvailablePort);
tomcat8AndCurrentModules =
new TomcatInstall("Tomcat8AndCurrentModules", TomcatInstall.TomcatVersion.TOMCAT8,
ContainerInstall.ConnectionType.CLIENT_SERVER,
- portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier::getAvailablePort);
classPathTomcat8AndOldModules = getClassPathTomcat8AndOldModules();
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
index 15dc1c8..7c71b83 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
@@ -120,24 +120,24 @@ public abstract class TomcatSessionBackwardsCompatibilityTestBase {
new TomcatInstall("Tomcat7079AndOldModules", TomcatInstall.TomcatVersion.TOMCAT7,
ContainerInstall.ConnectionType.CLIENT_SERVER,
oldModules.getAbsolutePath(), oldBuild.getAbsolutePath() + "/lib",
- portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier::getAvailablePort);
tomcat7079AndCurrentModules =
new TomcatInstall("Tomcat7079AndCurrentModules", TomcatInstall.TomcatVersion.TOMCAT7,
ContainerInstall.ConnectionType.CLIENT_SERVER,
- portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier::getAvailablePort);
tomcat8AndOldModules =
new TomcatInstall("Tomcat8AndOldModules", TomcatInstall.TomcatVersion.TOMCAT8,
ContainerInstall.ConnectionType.CLIENT_SERVER,
oldModules.getAbsolutePath(),
oldBuild.getAbsolutePath() + "/lib",
- portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier::getAvailablePort);
tomcat8AndCurrentModules =
new TomcatInstall("Tomcat8AndCurrentModules", TomcatInstall.TomcatVersion.TOMCAT8,
ContainerInstall.ConnectionType.CLIENT_SERVER,
- portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
+ portSupplier::getAvailablePort);
classPathTomcat7079 = tomcat7079AndCurrentModules.getHome() + "/lib/*" + File.pathSeparator
+ tomcat7079AndCurrentModules.getHome() + "/bin/*";