You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/12/16 20:23:22 UTC
[lucene-solr] 01/02: @1246 Cleanup.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 97d78e70ef43456dd2ddd6cc88de9e0c350fd0f0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Dec 16 14:11:31 2020 -0600
@1246 Cleanup.
---
.../solr/core/backup/repository/HdfsBackupRepositoryTest.java | 2 --
.../src/java/org/apache/solr/common/cloud/ZkStateReader.java | 10 +++++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java b/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java
index 34ec910..bb693e2 100644
--- a/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java
@@ -27,8 +27,6 @@ import org.apache.solr.core.HdfsDirectoryFactory;
import org.apache.solr.store.hdfs.HdfsDirectory;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
@LuceneTestCase.Nightly
public class HdfsBackupRepositoryTest extends SolrTestCase {
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 68ae466..553782f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -920,12 +920,12 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
} catch (NullPointerException e) {
// okay
}
- if (notifications != null) {
- notifications.shutdownNow();
- }
+// if (notifications != null) {
+// notifications.shutdownNow();
+// }
- waitLatches.forEach(c -> { for (int i = 0; i < c.getCount(); i++) c.countDown(); });
- waitLatches.clear();
+// waitLatches.forEach(c -> { for (int i = 0; i < c.getCount(); i++) c.countDown(); });
+// waitLatches.clear();
} finally {
assert ObjectReleaseTracker.release(this);