svn commit: r738378 - in /lucene/solr/trunk: CHANGES.txt src/java/org/apache/solr/core/CoreContainer.java src/java/org/apache/solr/core/CoreDescriptor.java src/java/org/apache/solr/handler/admin/CoreAdminHandler.java

[shalin]

Author: shalin
Date: Wed Jan 28 06:30:58 2009
New Revision: 738378

URL: http://svn.apache.org/viewvc?rev=738378&view=rev
Log:
SOLR-883 -- Implicit properties are not set for Cores created through CoreAdmin

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
    lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
    
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=738378&r1=738377&r2=738378&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Jan 28 06:30:58 2009
@@ -221,6 +221,8 @@
 
 25. SOLR-978: Old files are not removed from slaves after replication (Jaco, 
Noble Paul, shalin)
 
+26. SOLR-883: Implicit properties are not set for Cores created through 
CoreAdmin (Noble Paul via shalin)
+
 
 Other Changes
 ----------------------

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java?rev=738378&r1=738377&r2=738378&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java 
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Wed Jan 
28 06:30:58 2009
@@ -202,7 +202,6 @@
           List<String> aliases = StrUtils.splitSmart(names,',');
           String name = aliases.get(0);
           CoreDescriptor p = new CoreDescriptor(this, name, 
DOMUtil.getAttr(node, "instanceDir", null));
-          p.setCoreProperties(readProperties(cfg, node));
 
           // deal with optional settings
           String opt = DOMUtil.getAttr(node, "config", null);
@@ -214,6 +213,8 @@
             p.setSchemaName(opt);
           }
 
+          p.setCoreProperties(readProperties(cfg, node));
+
           SolrCore core = create(p);
 
           for (int a=1; a<aliases.size(); a++) {

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java?rev=738378&r1=738377&r2=738378&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java 
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java Wed Jan 
28 06:30:58 2009
@@ -129,11 +129,12 @@
    * 
    * @param coreProperties
    */
-  void setCoreProperties(Properties coreProperties) {
+  public void setCoreProperties(Properties coreProperties) {
     if (this.coreProperties == null) {
       Properties p = initImplicitProperties();
       this.coreProperties = new Properties(p);
-      this.coreProperties.putAll(coreProperties);
+      if(coreProperties != null)
+        this.coreProperties.putAll(coreProperties);
     }
   }
 }

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=738378&r1=738377&r2=738378&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java 
(original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java 
Wed Jan 28 06:30:58 2009
@@ -103,6 +103,8 @@
         if (opts != null)
           dcore.setSchemaName(opts);
 
+        dcore.setCoreProperties(null);
+
         SolrCore core = cores.create(dcore);
         cores.register(name, core,false);
         rsp.add("core", core.getName());