svn commit: r1071831 - /lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java

[yo...@apache.org]

Author: yonik
Date: Thu Feb 17 23:09:43 2011
New Revision: 1071831

URL: http://svn.apache.org/viewvc?rev=1071831&view=rev
Log:
SOLR-2369: turn off zookeeper log4j mbean registration due to slf4j incompat

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java?rev=1071831&r1=1071830&r2=1071831&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java Thu Feb 17 23:09:43 2011
@@ -133,6 +133,11 @@ public class CoreContainer 
     if (zkRun == null && zookeeperHost == null)
         return;  // not in zk mode
 
+    // zookeeper in quorum mode currently causes a failure when trying to
+    // register log4j mbeans.  See SOLR-2369
+    // TODO: remove after updating to an slf4j based zookeeper
+    System.setProperty("zookeeper.jmx.log4j.disable", "true");
+
     zkServer = new SolrZkServer(zkRun, zookeeperHost, solrHome, hostPort);
     zkServer.parseConfig();
     zkServer.start();