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/12/09 19:27:38 UTC
lucene-solr:jira/http2: Fix possible thread leaks in test
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 cc55082f2 -> 0ecb8110e
Fix possible thread leaks in test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0ecb8110
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0ecb8110
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0ecb8110
Branch: refs/heads/jira/http2
Commit: 0ecb8110eafb6b33b445f94c0bf171307b5a7a71
Parents: cc55082
Author: Cao Manh Dat <da...@apache.org>
Authored: Sun Dec 9 19:27:22 2018 +0000
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sun Dec 9 19:27:22 2018 +0000
----------------------------------------------------------------------
.../src/java/org/apache/solr/SolrJettyTestBase.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0ecb8110/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
index 23dfc3a..819d430 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@ -118,7 +118,7 @@ abstract public class SolrJettyTestBase extends SolrTestCaseJ4
}
@After
- public void afterClass() throws Exception {
+ public synchronized void afterClass() throws Exception {
if (client != null) client.close();
client = null;
}
@@ -132,13 +132,11 @@ abstract public class SolrJettyTestBase extends SolrTestCaseJ4
}
- public SolrClient getSolrClient() {
- {
- if (client == null) {
- client = createNewSolrClient();
- }
- return client;
+ public synchronized SolrClient getSolrClient() {
+ if (client == null) {
+ client = createNewSolrClient();
}
+ return client;
}
/**