---

spkrka · sduskis · commit c72a064a7dc3 · 2019-03-19T12:26:43.000-04:00
yaml --- r: 23395 b: refs/heads/autosynth-dialogflow c: bd8d2ce h: refs/heads/master i: 23393: bc53682 23391: 9ad18d1
diff --git a/[refs] b/[refs]
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigtable: 9e5429f45cf9face9fed585d0233534993e36b58
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: af5b804492292b43372c9fe00386696136ccae89
 refs/heads/autosynth-datastore: d0fc1187000c7a50d8bddd89c3b7cdf1187ecb96
-refs/heads/autosynth-dialogflow: 03ba9c91cab9113f30bfc43d185fc87d1b515303
+refs/heads/autosynth-dialogflow: bd8d2cecdfb56b35d41a86697eda279e34f19bcf
 refs/heads/autosynth-errorreporting: 1101a04e8be074802c35332d5fcf8297f61cae32
 refs/heads/autosynth-firestore: d1a44f9acc302750e37b008ecb9c1aa535cc94df
 refs/heads/autosynth-iot: f03bdd338a9056ca3b7ea6d9ca901649ba9aab78
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
@@ -70,11 +70,9 @@
 import com.google.logging.v2.WriteLogEntriesResponse;
 import com.google.protobuf.Empty;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -83,9 +81,7 @@ class LoggingImpl extends BaseService<LoggingOptions> implements Logging {
 
   private static final int FLUSH_WAIT_TIMEOUT_SECONDS = 6;
   private final LoggingRpc rpc;
-  private final Object writeLock = new Object();
-  private final Set<ApiFuture<Void>> pendingWrites =
-      Collections.newSetFromMap(new IdentityHashMap<ApiFuture<Void>, Boolean>());
+  private final Map<Object, ApiFuture<Void>> pendingWrites = new ConcurrentHashMap<>();
 
   private volatile Synchronicity writeSynchronicity = Synchronicity.ASYNC;
   private volatile Severity flushSeverity = null;
@@ -575,9 +571,7 @@ public void flush() {
     // BUG(1795): We should force batcher to issue RPC call for buffered messages,
     // so the code below doesn't wait uselessly.
     ArrayList<ApiFuture<Void>> writesToFlush = new ArrayList<>();
-    synchronized (writeLock) {
-      writesToFlush.addAll(pendingWrites);
-    }
+    writesToFlush.addAll(pendingWrites.values());
 
     try {
       ApiFutures.allAsList(writesToFlush).get(FLUSH_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
@@ -596,16 +590,13 @@ private void writeLogEntries(Iterable<LogEntry> logEntries, WriteOption... write
       case ASYNC:
       default:
         final ApiFuture<Void> writeFuture = writeAsync(logEntries, writeOptions);
-        synchronized (writeLock) {
-          pendingWrites.add(writeFuture);
-        }
+        final Object pendingKey = new Object();
+        pendingWrites.put(pendingKey, writeFuture);
         ApiFutures.addCallback(
             writeFuture,
             new ApiFutureCallback<Void>() {
               private void removeFromPending() {
-                synchronized (writeLock) {
-                  pendingWrites.remove(writeFuture);
-                }
+                pendingWrites.remove(pendingKey);
               }
 
               @Override
@@ -711,8 +702,6 @@ public void close() throws Exception {
 
   @VisibleForTesting
   int getNumPendingWrites() {
-    synchronized (writeLock) {
-      return pendingWrites.size();
-    }
+    return pendingWrites.size();
   }
 }
