cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/3] cassandra git commit: Don't load mx4j beans twice
Date Wed, 02 Nov 2016 18:24:17 GMT
Don't load mx4j beans twice

patch by Eduard Tudenhoefner; reviewed by Robert Stupp for CASSANDRA-12869


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2d7299e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2d7299e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2d7299e

Branch: refs/heads/trunk
Commit: d2d7299ee2442b762f5ee2814745e7b5720a41d6
Parents: ccac7ef
Author: Eduard Tudenhoefner <eduard.tudenhoefner@datastax.com>
Authored: Wed Nov 2 19:22:05 2016 +0100
Committer: Robert Stupp <snazy@snazy-ds15.local>
Committed: Wed Nov 2 19:22:05 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d7299e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b16518..25facd5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.10
+ * Don't load MX4J beans twice (CASSANDRA-12869)
  * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion
enum (CASSANDRA-12838)
  * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
  * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d7299e/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index fcaa069..5a97dfe 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -411,8 +411,6 @@ public class CassandraDaemon
 
         ScheduledExecutors.optionalTasks.schedule(viewRebuild, StorageService.RING_DELAY,
TimeUnit.MILLISECONDS);
 
-        Mx4jTool.maybeLoad();
-
         if (!FBUtilities.getBroadcastAddress().equals(InetAddress.getLoopbackAddress()))
             waitForGossipToSettle();
 


Mime
View raw message