cleanup

Author: jmwski

firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java

@@ -3431,7 +3431,6 @@ public void offlineQueryGet() throws DatabaseException, InterruptedException {
     FirebaseApp app =
         appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
     FirebaseDatabase db = FirebaseDatabase.getInstance(app);
-    db.setLogLevel(Logger.Level.DEBUG);
     DatabaseReference node = db.getReference();
     db.goOffline();
     try {

firebase-database/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java

@@ -132,12 +132,16 @@ private Map<String, Object> getRequest() {
       return request;
     }
 
+    /**
+     * Mark this OutstandingGet as sent. Essentially compare-and-set on the `sent` member.
+     *
+     * @return true if the OustandingGet wasn't already sent, false if it was.
+     */
     private boolean markSent() {
-      boolean prev = sent;
-      if (prev) {
+      if (sent) {
         return false;
       }
-      this.sent = true;
+      sent = true;
       return true;
     }
   }
@@ -418,8 +422,7 @@ public void onResponse(Map<String, Object> response) {
           new Runnable() {
             @Override
             public void run() {
-              OutstandingGet get = outstandingGets.get(readId);
-              if (get == null || get != outstandingGet || !get.markSent()) {
+              if (!outstandingGet.markSent()) {
                 return;
               }
               if (logger.logsDebug()) {