[beam] branch master updated: [BEAM-7016] guard DataflowWorkerLoggingInitializer.reset

[michel]

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

michel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 7c4e9b7  [BEAM-7016] guard DataflowWorkerLoggingInitializer.reset
     new a73c657  Merge pull request #8245: [BEAM-7016] Guard 
DataflowWorkerLoggingInitializer.reset
7c4e9b7 is described below

commit 7c4e9b78ebd476428a29f1f84a924cf5b7b7a809
Author: Michael Luckey <25622840+adude3...@users.noreply.github.com>
AuthorDate: Mon Apr 8 02:37:28 2019 +0200

    [BEAM-7016] guard DataflowWorkerLoggingInitializer.reset
---
 .../dataflow/worker/logging/DataflowWorkerLoggingInitializer.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingInitializer.java
 
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingInitializer.java
index 69d5599..3200bc8 100644
--- 
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingInitializer.java
+++ 
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingInitializer.java
@@ -214,7 +214,10 @@ public class DataflowWorkerLoggingInitializer {
   }
 
   @VisibleForTesting
-  public static void reset() {
+  public static synchronized void reset() {
+    if (!initialized) {
+      return;
+    }
     configuredLoggers = Lists.newArrayList();
     System.setOut(originalStdOut);
     System.setErr(originalStdErr);