Merge pull request #186 from madmatt/pulls/fix-configure

FIX: coreIsActive() failed when using a namespaced core
silverstripe · Dec 5, 2017 · 44f7bc0 · 44f7bc0
2 parents ceff657 + 7bacda9
commit 44f7bc0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Solr/Services/SolrService.php b/src/Solr/Services/SolrService.php
@@ -36,8 +36,14 @@ protected function coreCommand($command, $core, $params = array())
      */
     public function coreIsActive($core)
     {
+        // Request the status of the full core name
         $result = $this->coreCommand('STATUS', $core);
-        return isset($result->status->$core->uptime);
+
+        // Solr returns the core as the 'short name' of the class (e.g. Mysite\Search\SolrIndex -> SolrIndex)
+        $reflection = new \ReflectionClass($core);
+        $shortClass = $reflection->getShortName();
+
+        return isset($result->status->$shortClass->uptime);
     }
 
     /**