svn commit: r891412 - /lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java

[ma...@apache.org]

Author: markrmiller
Date: Wed Dec 16 20:07:45 2009
New Revision: 891412

URL: http://svn.apache.org/viewvc?rev=891412&view=rev
Log:
go to getting the ZooKeeperComponent from CoreDescriptor.getCoreContainer for now

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java?rev=891412&r1=891411&r2=891412&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java Wed Dec 16 20:07:45 2009
@@ -93,9 +93,6 @@
   private IndexDeletionPolicyWrapper solrDelPolicy;
   private DirectoryFactory directoryFactory;
   private IndexReaderFactory indexReaderFactory;
-  
-  // null if not in use - nocommit:here for convenience - consider
-  private ZooKeeperController zooKeeperController;
 
   public long getStartTime() { return startTime; }
 
@@ -226,14 +223,6 @@
     return indexReaderFactory;
   }
   
-  //nocommit: consider
-  /**
-   * @return ZooKeeperController for this core or Null if none.
-   */
-  public ZooKeeperController getZooKeeperController() {
-    return zooKeeperController;
-  }
-  
   public String getName() {
     return name;
   }
@@ -504,7 +493,7 @@
   public SolrCore(String dataDir, IndexSchema schema) throws ParserConfigurationException, IOException, SAXException {
     this(null, dataDir, new SolrConfig(), schema, null );
   }
-
+  
   /**
    * Creates a new core and register it in the list of cores.
    * If a core with the same name already exists, it will be stopped and replaced by this one.
@@ -518,7 +507,6 @@
    * @since solr 1.3
    */
   public SolrCore(String name, String dataDir, SolrConfig config, IndexSchema schema, CoreDescriptor cd) {
-    this.zooKeeperController = cd.getCoreContainer().getZooKeeperController();
     coreDescriptor = cd;
     this.setName( name );
     resourceLoader = config.getResourceLoader();