fix for NPE & bug #264

pull/1/head
Michael Peter Christen 12 years ago
parent 735a66eff3
commit 39fceb5ccf

@ -124,7 +124,8 @@ public class InstanceMirror {
public EmbeddedSolrConnector getDefaultEmbeddedConnector() { public EmbeddedSolrConnector getDefaultEmbeddedConnector() {
if (this.defaultEmbeddedConnector != null) return this.defaultEmbeddedConnector; if (this.defaultEmbeddedConnector != null) return this.defaultEmbeddedConnector;
this.defaultEmbeddedConnector = this.solr0 == null ? null : new EmbeddedSolrConnector(this.solr0); if (this.solr0 == null) return null;
this.defaultEmbeddedConnector = new EmbeddedSolrConnector(this.solr0);
String coreName = this.getDefaultCoreName(); String coreName = this.getDefaultCoreName();
if (coreName == null) return null; if (coreName == null) return null;
this.embeddedCache.put(coreName, this.defaultEmbeddedConnector); this.embeddedCache.put(coreName, this.defaultEmbeddedConnector);

Loading…
Cancel
Save