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.

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-4062 Fix failing test cases in concurrency TCK #4159

Merged
merged 2 commits into from
Aug 21, 2019
Merged
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ static enum CONTEXT_TYPE {CLASSLOADING, SECURITY, NAMING, WORKAREA}

private boolean classloading, security, naming, workArea;

private RequestTracingService requestTracing;
private OpenTracingService openTracing;
private StuckThreadsStore stuckThreads;
private transient RequestTracingService requestTracing;
private transient OpenTracingService openTracing;
private transient StuckThreadsStore stuckThreads;

public ContextSetupProviderImpl(InvocationManager invocationManager,
Deployment deployment,
Expand Down Expand Up @@ -387,6 +387,24 @@ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassN
if (!nullTransactionManager) {
transactionManager = concurrentRuntime.getTransactionManager();
}
try {
this.requestTracing = Globals.getDefaultHabitat().getService(RequestTracingService.class);
} catch (NullPointerException ex) {
logger.log(Level.INFO, "Error retrieving Request Tracing service "
+ "during initialisation of Concurrent Context - NullPointerException");
}
try {
this.stuckThreads = Globals.getDefaultHabitat().getService(StuckThreadsStore.class);
} catch (NullPointerException ex) {
logger.log(Level.INFO, "Error retrieving Stuck Threads Sore Healthcheck service "
+ "during initialisation of Concurrent Context - NullPointerException");
}
try {
this.openTracing = Globals.getDefaultHabitat().getService(OpenTracingService.class);
} catch (NullPointerException ex) {
logger.log(Level.INFO, "Error retrieving OpenTracing service "
+ "during initialisation of Concurrent Context - NullPointerException");
}
}

private static class PairKey {
Expand Down