You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2019/12/11 09:36:57 UTC

[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5554 Synchronize @Parameters, @BeforeClass and @AfterClass methods (addendum)

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
     new d33bf3c  PHOENIX-5554 Synchronize @Parameters, @BeforeClass and @AfterClass methods (addendum)
d33bf3c is described below

commit d33bf3c01ef0491c64de6e81d6739fabe90c0f49
Author: Istvan Toth <st...@stoty.hu>
AuthorDate: Wed Dec 11 10:35:34 2019 +0100

    PHOENIX-5554 Synchronize @Parameters, @BeforeClass and @AfterClass methods (addendum)
    
    fix incorrect changes introduced by heuristics
---
 .../src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java  | 2 +-
 phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
index 0dbffaa..c83d101 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
@@ -43,7 +43,7 @@ public abstract class ParallelStatsEnabledIT extends BaseTest {
     protected static RegionCoprocessorEnvironment TaskRegionEnvironment;
 
     @BeforeClass
-    public static synchronized void doSetup() throws Exception {
+    public static synchronized final void doSetup() throws Exception {
         Map<String, String> props = Maps.newHashMapWithExpectedSize(1);
         props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(20));
         props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, Long.toString(5));
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index b97be3d..ee0683b 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -451,7 +451,7 @@ public abstract class BaseTest {
         }
     }
     
-    protected static synchronized void destroyDriver() {
+    protected static void destroyDriver() {
         if (driver != null) {
             try {
                 assertTrue(destroyDriver(driver));