Merged in PAYARA-3114-5.183-Maintenance (pull request payara#515)

PAYARA-3114 - 5.183 Maintenance
MarkWareham · Oct 11, 2018 · 90fecf0 · 90fecf0
2 parents 4a4f4e5 + 7b8a620
commit 90fecf0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git 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
diff --git a/...a-modules/opentracing-adapter/src/main/java/fish/payara/opentracing/OpenTracingScope.java b/...a-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;