From 6b29b960125a5a824baded9828f477037bb0dc64 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <andrew.pielage@payara.fish>
Date: Tue, 18 Sep 2018 15:55:21 +0100
Subject: [PATCH] PAYARA- 3114 Remove quicklook summary & add to gitignore, and
 fix Concurrent Mod Exception

---
 .gitignore                                                 | 1 +
 appserver/tests/quicklook/quicklook_summary.txt            | 5 -----
 .../java/fish/payara/opentracing/OpenTracingScope.java     | 7 ++++---
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 appserver/tests/quicklook/quicklook_summary.txt

diff --git a/.gitignore b/.gitignore
index 53b1783eaff..b3b9d49c776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ nb-configuration.xml
 appserver/extras/arquillian-containers/payara-common/dependency-reduced-pom.xml
 /nucleus/payara-modules/service-exemplar/nbproject/
 /nucleus/admin/server-mgmt/nbproject/
+appserver/tests/quicklook/quicklook_summary.txt
diff --git a/appserver/tests/quicklook/quicklook_summary.txt b/appserver/tests/quicklook/quicklook_summary.txt
deleted file mode 100644
index b6bad1946bf..00000000000
--- a/appserver/tests/quicklook/quicklook_summary.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-    Test completed: Tue 04/24/2018 17:28:32 CEST 
-    ===============================================
-    QuickLookTests
-    Total tests run: 106, Failures: 0, Skips: 0
-    ===============================================
diff --git a/nucleus/payara-modules/opentracing-adapter/src/main/java/fish/payara/opentracing/OpenTracingScope.java b/nucleus/payara-modules/opentracing-adapter/src/main/java/fish/payara/opentracing/OpenTracingScope.java
index 952b79ea84b..a7cf989c320 100644
--- a/nucleus/payara-modules/opentracing-adapter/src/main/java/fish/payara/opentracing/OpenTracingScope.java
+++ b/nucleus/payara-modules/opentracing-adapter/src/main/java/fish/payara/opentracing/OpenTracingScope.java
@@ -48,7 +48,7 @@
 import java.util.Map;
 
 /**
- * Implementation of Scope from Opentracing.
+ * Implementation of Scope from OpenTracing.
  * 
  * @author jonathan coustick
  * @since 5.183
@@ -70,7 +70,8 @@ public void close() {
             if (allSpans.get(span)){
                 span.finish();
             }
-            allSpans.remove(span);//prevents scope holding on a reference to old spans
+            // Prevent scope holding on a reference to old spans
+            keys.remove();
         }
     }
 
@@ -79,7 +80,7 @@ public Span span() {
         return currentSpan;
     }
     
-    //package private - used only by ScopeManager
+    // Package private - used only by ScopeManager
     void setSpan(Span span, Boolean finishOnClose){
         allSpans.put(span, finishOnClose);
         currentSpan = span;