This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f6f46fe1a2f432ef2fc00af47855e16e149cab07
Merge: 16da961 925ad35
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Wed Oct 7 17:06:30 2020 -0700
Merge branch 'cassandra-3.11' into trunk
.../org/apache/cassandra/distributed/impl/AbstractCluster.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index bd3f338,6fae4f0..3fee754
---
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -186,11 -163,11 +186,11 @@@ public abstract class AbstractCluster<
private IInvokableInstance newInstance(int generation)
{
- InstanceClassLoader classLoader = new
InstanceClassLoader(generation, config.num(), version.classpath,
sharedClassLoader);
+ ClassLoader classLoader = new InstanceClassLoader(generation,
config.num(), version.classpath, sharedClassLoader);
if (instanceInitializer != null)
instanceInitializer.accept(classLoader, config.num());
- return
Instance.transferAdhoc((SerializableBiFunction<IInstanceConfig, ClassLoader,
IInvokableInstance>)Instance::new, classLoader)
- .apply(config, classLoader);
+ return
Instance.transferAdhoc((SerializableBiFunction<IInstanceConfig, ClassLoader,
Instance>)Instance::new, classLoader)
+
.apply(config.forVersion(version.major), classLoader);
}
public IInstanceConfig config()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
