Merge branch 'cassandra-3.0' into cassandra-3.11

apache · Aug 28, 2020 · 0023cfb · 0023cfb
2 parents 318bd1a + 81f8a9f
commit 0023cfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -14,7 +14,8 @@ Merged from 3.0:
  * Handle difference in timestamp precision between java8 and java11 in LogFIle.java (CASSANDRA-16050)
 Merged from 2.2:
  * Fix CQL parsing of collections when the column type is reversed (CASSANDRA-15814)
-
+Merged from 2.1:
+ * Only allow strings to be passed to JMX authentication (CASSANDRA-16077)
 
 3.11.7
  * Fix cqlsh output when fetching all rows in batch mode (CASSANDRA-15905)

diff --git a/src/java/org/apache/cassandra/utils/JMXServerUtils.java b/src/java/org/apache/cassandra/utils/JMXServerUtils.java
@@ -164,7 +164,8 @@ private static Map<String, Object> configureJmxAuthentication()
 
             env.put(JMXConnectorServer.AUTHENTICATOR, new JMXPluggableAuthenticatorWrapper(env));
         }
-
+        env.put("jmx.remote.rmi.server.credential.types",
+            new String[] { String[].class.getName(), String.class.getName() });
         return env;
     }