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 2020/07/11 04:27:25 UTC
[lucene-solr] branch branch_8x updated: SOLR-14354: Fix compile
errors after cherry-pick
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 21d811d SOLR-14354: Fix compile errors after cherry-pick
21d811d is described below
commit 21d811d29615ac47bc51e12a4f9f216af8463c3f
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Sat Jul 11 11:26:58 2020 +0700
SOLR-14354: Fix compile errors after cherry-pick
---
.../src/java/org/apache/solr/handler/component/HttpShardHandler.java | 2 +-
.../src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index 74c8604..6383587 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -157,7 +157,7 @@ public class HttpShardHandler extends ShardHandler {
}
// all variables that set inside this listener must be at least volatile
- responseCancellableMap.put(srsp, this.lbClient.asyncReq(lbReq, new AsyncListener<>() {
+ responseCancellableMap.put(srsp, this.lbClient.asyncReq(lbReq, new AsyncListener<LBSolrClient.Rsp>() {
volatile long startTime = System.nanoTime();
@Override
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java
index 96f96bf..62bf7b2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java
@@ -148,7 +148,7 @@ public class LBHttp2SolrClient extends LBSolrClient {
boolean isZombie, RetryListener listener) {
rsp.server = baseUrl;
req.getRequest().setBasePath(baseUrl);
- return ((Http2SolrClient)getClient(baseUrl)).asyncRequest(req.getRequest(), null, new AsyncListener<>() {
+ return ((Http2SolrClient)getClient(baseUrl)).asyncRequest(req.getRequest(), null, new AsyncListener<NamedList<Object>>() {
@Override
public void onSuccess(NamedList<Object> result) {
rsp.rsp = result;