You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/21 08:40:45 UTC
[2/3] lucene-solr:jira/http2: Fix compile error caused by last commit
Fix compile error caused by last commit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eacd7e62
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eacd7e62
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eacd7e62
Branch: refs/heads/jira/http2
Commit: eacd7e62011279d5accd42395beafc76b0d93b7b
Parents: 3a38ace
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 21 10:55:19 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 21 10:55:19 2018 +0700
----------------------------------------------------------------------
.../org/apache/solr/update/SolrCmdDistributor.java | 2 +-
.../apache/solr/update/MockingHttp2SolrClient.java | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eacd7e62/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index 8369fcc..c8ad92f 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -168,7 +168,7 @@ public class SolrCmdDistributor {
pendingTasksPhaser.arriveAndDeregister();
} else {
//TODO write add cmds in single outputstream
- client.request(req.uReq, null, new Http2SolrClient.OnComplete<NamedList>() {
+ client.request(req.uReq, null, new Http2SolrClient.OnComplete() {
@Override
public void onSuccess(NamedList result) {
req.trackRequestResult(result, true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eacd7e62/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
index 2b8d8a2..6f701be 100644
--- a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
+++ b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
@@ -118,19 +118,23 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
return super.request(request, collection);
}
- public Http2ClientResponse request(SolrRequest request, String collection, OnComplete onComplete)
+ public void request(SolrRequest request, String collection, OnComplete onComplete)
throws SolrServerException, IOException {
if (request instanceof UpdateRequest) {
UpdateRequest ur = (UpdateRequest) request;
// won't throw exception if request is DBQ
- if (ur.getDeleteQuery() != null && !ur.getDeleteQuery().isEmpty())
- return super.request(request, collection, onComplete);
+ if (ur.getDeleteQuery() != null && !ur.getDeleteQuery().isEmpty()) {
+ super.request(request, collection, onComplete);
+ return;
+ }
}
if (exp != null) {
if (oneExpPerReq) {
- if (reqGotException.contains(request))
- return super.request(request, collection, onComplete);
+ if (reqGotException.contains(request)) {
+ super.request(request, collection, onComplete);
+ return;
+ }
else
reqGotException.add(request);
}
@@ -149,6 +153,6 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
}
}
- return super.request(request, collection, onComplete);
+ super.request(request, collection, onComplete);
}
}