From c822183e98aa26f005338464f3946dcbf34802aa Mon Sep 17 00:00:00 2001
From: Sergey Tsypanov <stsypanov@openjdk.org>
Date: Thu, 10 Aug 2023 05:50:19 +0000
Subject: [PATCH] 8313768: Reduce interaction with volatile field in
 j.u.l.StreamHandler

Reviewed-by: dfuchs, jpai
---
 .../share/classes/java/util/logging/StreamHandler.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/java.logging/share/classes/java/util/logging/StreamHandler.java b/src/java.logging/share/classes/java/util/logging/StreamHandler.java
index 320638d91a1..217587dfd7a 100644
--- a/src/java.logging/share/classes/java/util/logging/StreamHandler.java
+++ b/src/java.logging/share/classes/java/util/logging/StreamHandler.java
@@ -231,6 +231,7 @@ public class StreamHandler extends Handler {
             }
         }
     }
+
     private void publish0(LogRecord record) {
         if (!isLoggable(record)) {
             return;
@@ -246,6 +247,7 @@ public class StreamHandler extends Handler {
         }
 
         try {
+            Writer writer = this.writer;
             if (!doneHeader) {
                 writer.write(getFormatter().getHead(this));
                 doneHeader = true;
@@ -295,7 +297,9 @@ public class StreamHandler extends Handler {
             }
         }
     }
+
     private void flush0() {
+        Writer writer = this.writer;
         if (writer != null) {
             try {
                 writer.flush();
@@ -309,6 +313,7 @@ public class StreamHandler extends Handler {
 
     private void flushAndClose() throws SecurityException {
         checkPermission();
+        Writer writer = this.writer;
         if (writer != null) {
             try {
                 if (!doneHeader) {
@@ -323,8 +328,8 @@ public class StreamHandler extends Handler {
                 // report the exception to any registered ErrorManager.
                 reportError(null, ex, ErrorManager.CLOSE_FAILURE);
             }
-            writer = null;
             output = null;
+            this.writer = null;
         }
     }