Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5415 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1538325 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2013-11-03 07:08:14 +00:00
parent 5e87b67337
commit e3fa6f3367
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
solr/core/src/java/org/apache/solr/core/CoreContainer.java
View File

@ -271,7 +271,7 @@ public class CoreContainer {
c = create(cd); c = create(cd);
registerCore(cd.isTransient(), name, c, false); registerCore(cd.isTransient(), name, c, false);
} catch (Throwable t) { } catch (Throwable t) {
if (isZooKeeperAware()) { /* if (isZooKeeperAware()) {
try { try {
zkSys.zkController.unregister(name, cd); zkSys.zkController.unregister(name, cd);
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -280,7 +280,7 @@ public class CoreContainer {
} catch (KeeperException e) { } catch (KeeperException e) {
SolrException.log(log, null, e); SolrException.log(log, null, e);
} }
} }*/
SolrException.log(log, null, t); SolrException.log(log, null, t);
if (c != null) { if (c != null) {
c.close(); c.close();
@ -834,7 +834,7 @@ public class CoreContainer {
// remains to be seen how transient cores and such // remains to be seen how transient cores and such
// will work in SolrCloud mode, but just to be future // will work in SolrCloud mode, but just to be future
// proof... // proof...
if (isZooKeeperAware()) { /*if (isZooKeeperAware()) {
try { try {
getZkController().unregister(name, desc); getZkController().unregister(name, desc);
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -843,7 +843,7 @@ public class CoreContainer {
} catch (KeeperException e) { } catch (KeeperException e) {
SolrException.log(log, null, e); SolrException.log(log, null, e);
} }
} }*/
throw recordAndThrow(name, "Unable to create core: " + name, ex); throw recordAndThrow(name, "Unable to create core: " + name, ex);
} finally { } finally {
solrCores.removeFromPendingOps(name); solrCores.removeFromPendingOps(name);