Permalink
Browse files

[ignore] avoid NPE

svn path=/branches/rangeindex/; revision=18765
  • Loading branch information...
1 parent d7bff15 commit 513078864d435867e777c10def7da87235ab4381 @shabanovd shabanovd committed Jul 24, 2013
@@ -88,8 +88,6 @@
protected LuceneIndex index;
- private IndexController controller;
-
private LuceneMatchListener matchListener = null;
private XMLToQuery queryTranslator;
@@ -135,7 +133,6 @@ public QueryRewriter getQueryRewriter(XQueryContext context) {
}
public Object configure(IndexController controller, NodeList configNodes, Map<String, String> namespaces) throws DatabaseConfigurationException {
- this.controller = controller;
LOG.debug("Configuring lucene index...");
config = new LuceneConfig(configNodes, namespaces);
return config;
@@ -1142,7 +1139,7 @@ private void write() {
final List<Field> metas = new ArrayList<Field>();
final List<CategoryPath> paths = new ArrayList<CategoryPath>();
- controller.streamMetas(new MetaStreamListener() {
+ broker.getIndexController().streamMetas(new MetaStreamListener() {
@Override
public void metadata(QName key, Object value) {
if (value instanceof String) {
@@ -1783,7 +1783,7 @@ public void reindexCollection(Collection collection, int mode) throws Permission
reindexCollection(transaction, collection, mode);
transact.commit(transaction);
- } catch (final TransactionException e) {
+ } catch (final Exception e) {
transact.abort(transaction);
LOG.warn("An error occurred during reindex: " + e.getMessage(), e);

0 comments on commit 5130788

Please sign in to comment.