From 89a5da80e0049de7bbf1670d5b021574d8a96a83 Mon Sep 17 00:00:00 2001
From: Kerry Ivan Kurian <kkurian@gmail.com>
Date: Thu, 18 Oct 2018 00:54:15 -0700
Subject: [PATCH] Do not display incomplete metadata

---
 .../marketplaceItemTester/MarketplaceItemTester.qml |  5 ++---
 libraries/networking/src/ResourceCache.cpp          | 13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
index 98b0355e81..f06612d035 100644
--- a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
+++ b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
@@ -69,9 +69,8 @@ Rectangle {
                 // object ids.
                 if (date >= startDate) {
                     resourceAccessEventText += (
-                        message.data.callerId + " " + message.data.extra +
-                        " " + message.data.url +
-                        " [" + date.toISOString() + "]\n"
+                        "[" + date.toISOString() + "] " +
+                        message.data.url.toString().replace("__NONE__,", "") + "\n"
                     );
                 }
                 break;
diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index 3cf12cb824..186addbd86 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -498,15 +498,7 @@ bool ResourceCache::attemptRequest(QSharedPointer<Resource> resource) {
         resource->makeRequest();
         return true;
     }
-<<<<<<< HEAD
     return false;
-=======
-
-    ++_requestsActive;
-    sharedItems->appendActiveRequest(resource);
-    resource->makeRequest();
-    return true;
->>>>>>> ac26e68e78... Display resource-access events in marketplace item tester
 }
 
 void ResourceCache::requestCompleted(QWeakPointer<Resource> resource) {
@@ -614,13 +606,8 @@ void Resource::allReferencesCleared() {
     }
 
     if (_cache && isCacheable()) {
-<<<<<<< HEAD
         // create and reinsert new shared pointer
         QSharedPointer<Resource> self(this, &Resource::deleter);
-=======
-        // create and reinsert new shared pointer
-        QSharedPointer<Resource> self(this, &Resource::allReferencesCleared);
->>>>>>> ac26e68e78... Display resource-access events in marketplace item tester
         setSelf(self);
         reinsert();