[incubator-dubbo] branch master updated: Merge pull request #3323, fix double-checked locking.

[liujun]

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

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new faf3983  Merge pull request #3323, fix double-checked locking.
faf3983 is described below

commit faf398371059c02edcd4e83998cc0fc73935114a
Author: Yuhao Bi <byh0...@gmail.com>
AuthorDate: Thu Jan 24 14:48:24 2019 +0800

    Merge pull request #3323, fix double-checked locking.
---
 .../org/apache/dubbo/metadata/integration/MetadataReportService.java    | 2 +-
 .../java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
index d0dfa73..c457950 100644
--- 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
+++ 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
@@ -38,7 +38,7 @@ public class MetadataReportService {
 
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private static MetadataReportService metadataReportService;
+    private static volatile MetadataReportService metadataReportService;
     private static Object lock = new Object();
 
     private MetadataReportFactory metadataReportFactory = 
ExtensionLoader.getExtensionLoader(MetadataReportFactory.class).getAdaptiveExtension();
diff --git 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
index bedb085..f1bff8a 100644
--- 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
+++ 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
@@ -357,7 +357,7 @@ public abstract class AbstractMetadataReport implements 
MetadataReport {
         protected final Logger logger = LoggerFactory.getLogger(getClass());
 
         final ScheduledExecutorService retryExecutor = 
Executors.newScheduledThreadPool(0, new 
NamedThreadFactory("DubboRegistryFailedRetryTimer", true));
-        ScheduledFuture retryScheduledFuture;
+        volatile ScheduledFuture retryScheduledFuture;
         AtomicInteger retryCounter = new AtomicInteger(0);
         // retry task schedule period
         long retryPeriod;