---

spkrka · sduskis · commit 772afa7e9a4a · 2019-03-19T07:16:52.000-04:00
yaml --- r: 27395 b: refs/heads/mrschmidt-collectiongroup c: 03ba9c9 h: refs/heads/master i: 27393: 0cc20b4 27391: 6de99f4
diff --git a/[refs] b/[refs]
@@ -173,7 +173,7 @@ refs/heads/autosynth-securitycenter: f2f2feb8f3949c986d37e55cd23cdb0ce774f287
 refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
 refs/heads/cscc-samples: 620d105e6b574cfeeee04e413a157b7bd34ebc8b
 refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
-refs/heads/mrschmidt-collectiongroup: 0a6fc39ab502f112b3cbdd671d8c79189c51bcdf
+refs/heads/mrschmidt-collectiongroup: 03ba9c91cab9113f30bfc43d185fc87d1b515303
 refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
 refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
 refs/heads/v4support: aa837fd70877f5a0628d8036e88952db035b792c
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
@@ -37,6 +37,7 @@
 import com.google.cloud.MonitoredResourceDescriptor;
 import com.google.cloud.PageImpl;
 import com.google.cloud.logging.spi.v2.LoggingRpc;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
@@ -595,6 +596,9 @@ private void writeLogEntries(Iterable<LogEntry> logEntries, WriteOption... write
       case ASYNC:
       default:
         final ApiFuture<Void> writeFuture = writeAsync(logEntries, writeOptions);
+        synchronized (writeLock) {
+          pendingWrites.add(writeFuture);
+        }
         ApiFutures.addCallback(
             writeFuture,
             new ApiFutureCallback<Void>() {
@@ -619,9 +623,6 @@ public void onFailure(Throwable t) {
                 }
               }
             });
-        synchronized (writeLock) {
-          pendingWrites.add(writeFuture);
-        }
         break;
     }
   }
@@ -707,4 +708,11 @@ public void close() throws Exception {
     }
     return optionMap;
   }
+
+  @VisibleForTesting
+  int getNumPendingWrites() {
+    synchronized (writeLock) {
+      return pendingWrites.size();
+    }
+  }
 }
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
@@ -1186,6 +1186,7 @@ public void testWriteLogEntries() {
     EasyMock.replay(rpcFactoryMock, loggingRpcMock);
     logging = options.getService();
     logging.write(ImmutableList.of(LOG_ENTRY1, LOG_ENTRY2));
+    assertEquals(0, ((LoggingImpl) logging).getNumPendingWrites());
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`import com.google.cloud.MonitoredResourceDescriptor;`
`38`	`38`	`import com.google.cloud.PageImpl;`
`39`	`39`	`import com.google.cloud.logging.spi.v2.LoggingRpc;`
	`40`	`+import com.google.common.annotations.VisibleForTesting;`
`40`	`41`	`import com.google.common.base.Function;`
`41`	`42`	`import com.google.common.base.Throwables;`
`42`	`43`	`import com.google.common.collect.ImmutableList;`
`@@ -595,6 +596,9 @@ private void writeLogEntries(Iterable<LogEntry> logEntries, WriteOption... write`
`595`	`596`	`case ASYNC:`
`596`	`597`	`default:`
`597`	`598`	`final ApiFuture<Void> writeFuture = writeAsync(logEntries, writeOptions);`
	`599`	`+ synchronized (writeLock) {`
	`600`	`+ pendingWrites.add(writeFuture);`
	`601`	`+ }`
`598`	`602`	`ApiFutures.addCallback(`
`599`	`603`	`writeFuture,`
`600`	`604`	`new ApiFutureCallback<Void>() {`
`@@ -619,9 +623,6 @@ public void onFailure(Throwable t) {`
`619`	`623`	`}`
`620`	`624`	`}`
`621`	`625`	`});`
`622`		`- synchronized (writeLock) {`
`623`		`- pendingWrites.add(writeFuture);`
`624`		`- }`
`625`	`626`	`break;`
`626`	`627`	`}`
`627`	`628`	`}`
`@@ -707,4 +708,11 @@ public void close() throws Exception {`
`707`	`708`	`}`
`708`	`709`	`return optionMap;`
`709`	`710`	`}`
	`711`	`+`
	`712`	`+ @VisibleForTesting`
	`713`	`+ int getNumPendingWrites() {`
	`714`	`+ synchronized (writeLock) {`
	`715`	`+ return pendingWrites.size();`
	`716`	`+ }`
	`717`	`+ }`
`710`	`718`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1186,6 +1186,7 @@ public void testWriteLogEntries() {`
`1186`	`1186`	`EasyMock.replay(rpcFactoryMock, loggingRpcMock);`
`1187`	`1187`	`logging = options.getService();`
`1188`	`1188`	`logging.write(ImmutableList.of(LOG_ENTRY1, LOG_ENTRY2));`
	`1189`	`+ assertEquals(0, ((LoggingImpl) logging).getNumPendingWrites());`
`1189`	`1190`	`}`
`1190`	`1191`
`1191`	`1192`	`@Test`