Merge "Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop()." into omaha_14.4.1

Former-commit-id: 8a51d088bc [formerly 4100c8f8d3f05a47676f2a5a7ee0bcf4d0151733]
Former-commit-id: d2d0d0f573
This commit is contained in:
Ron Anderson 2015-03-05 11:52:13 -06:00 committed by Gerrit Code Review
commit 43c476b825

View file

@ -319,7 +319,9 @@ public final class FetchActiveTableSrv implements IContextStateProcessor {
statusHandler.info("Shutting down FetchATSrv...");
activeServiceInstance = false;
jobExecutor.shutdown();
if (jobExecutor != null) {
jobExecutor.shutdown();
}
}
/*