Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAYARA-3114 Remove quicklook summary & add to gitignore, and fix Con… #3174

Merged
merged 1 commit into from
Sep 21, 2018
Merged

PAYARA-3114 Remove quicklook summary & add to gitignore, and fix Con… #3174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions appserver/tests/quicklook/quicklook_summary.txt
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions ...a-modules/opentracing-adapter/src/main/java/fish/payara/opentracing/OpenTracingScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import java.util.Map;

/**
* Implementation of Scope from Opentracing.
* Implementation of Scope from OpenTracing.
*
* @author jonathan coustick
* @since 5.183
Expand All @@ -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();
}
}

Expand All @@ -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;
Expand Down