You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2020/03/25 17:50:48 UTC
[cassandra] branch trunk updated (439e0b0 -> c768a14)
This is an automated email from the ASF dual-hosted git repository.
samt pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 439e0b0 Merge branch 'cassandra-3.11' into trunk
new 6a6dd8a Disable JMX rebinding
new 4815ae7 Merge branch 'cassandra-2.2' into cassandra-3.0
new bbe09d4 Merge branch 'cassandra-3.0' into cassandra-3.11
new c768a14 Merge branch 'cassandra-3.11' into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../org/apache/cassandra/utils/JMXServerUtils.java | 61 +++++++++++++++++++---
2 files changed, 56 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by sa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c768a14fb138639c83117665adea27bfd99bfc7a
Merge: 439e0b0 bbe09d4
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Wed Mar 25 17:38:25 2020 +0000
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/utils/JMXServerUtils.java | 61 +++++++++++++++++++---
2 files changed, 56 insertions(+), 6 deletions(-)
diff --cc src/java/org/apache/cassandra/utils/JMXServerUtils.java
index c8f4464,48d02f7..12036f9
--- a/src/java/org/apache/cassandra/utils/JMXServerUtils.java
+++ b/src/java/org/apache/cassandra/utils/JMXServerUtils.java
@@@ -286,15 -274,51 +292,58 @@@ public class JMXServerUtil
public Subject authenticate(Object credentials)
{
- JMXPluggableAuthenticator authenticator = new JMXPluggableAuthenticator(env);
- return authenticator.authenticate(credentials);
+ try
+ {
+ JMXAuthenticator authenticator = (JMXAuthenticator) ctorHandle.invoke(env);
+ return authenticator.authenticate(credentials);
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
+
+ /*
+ * Better to use the internal API than re-invent the wheel.
+ */
+ @SuppressWarnings("restriction")
+ private static class JmxRegistry extends sun.rmi.registry.RegistryImpl {
+ private final String lookupName;
+ private Remote remoteServerStub;
+
+ JmxRegistry(final int port,
+ final RMIClientSocketFactory csf,
+ RMIServerSocketFactory ssf,
+ final String lookupName) throws RemoteException {
+ super(port, csf, ssf);
+ this.lookupName = lookupName;
+ }
+
+ @Override
+ public Remote lookup(String s) throws RemoteException, NotBoundException {
+ return lookupName.equals(s) ? remoteServerStub : null;
+ }
+
+ @Override
+ public void bind(String s, Remote remote) throws RemoteException, AlreadyBoundException, AccessException {
+ }
+
+ @Override
+ public void unbind(String s) throws RemoteException, NotBoundException, AccessException {
+ }
+
+ @Override
+ public void rebind(String s, Remote remote) throws RemoteException, AccessException {
+ }
+
+ @Override
+ public String[] list() throws RemoteException {
+ return new String[] {lookupName};
+ }
+
+ public void setRemoteServerStub(Remote remoteServerStub) {
+ this.remoteServerStub = remoteServerStub;
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org