Merge branch 'stable-2.13'

* stable-2.13:
  Drain executor of index change requests before closing index

Change-Id: I2d676adf60d2eab0f9f7602b124574050af0ee3d
This commit is contained in:
David Pursehouse
2016-12-31 10:15:56 +00:00
10 changed files with 45 additions and 16 deletions

View File

@@ -117,6 +117,10 @@ class ElasticAccountIndex extends AbstractElasticIndex<Account.Id, AccountState>
}
}
@Override
public void stop() {
}
@Override
public DataSource<AccountState> getSource(Predicate<AccountState> p,
QueryOptions opts) throws QueryParseException {

View File

@@ -158,6 +158,10 @@ class ElasticChangeIndex extends AbstractElasticIndex<Change.Id, ChangeData>
}
}
@Override
public void stop() {
}
@Override
public ChangeDataSource getSource(Predicate<ChangeData> p, QueryOptions opts)
throws QueryParseException {