Skip to content

Commit 1f9af73

Browse files
committed
shutdown hook moved to point where engine instance is created
1 parent f021373 commit 1f9af73

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

Java/src/main/java/com/nuix/javaenginesimple/EngineWrapper.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ public void withDongleLicense(Consumer<Utilities> consumer) throws Exception{
138138
Utilities utilities = engine.getUtilities();
139139
ThirdPartyDependencyChecker.logAllDependencyInfo(utilities);
140140

141-
// Setup our shutdown hook in case user terminates before consumer returns
142-
logger.info("Adding shutdown hook for EngineWrapper::close");
143-
Runtime.getRuntime().addShutdownHook(shutdownHook);
144-
145141
logger.info("License was obtained, providing Utilities object to consumer...");
146142
consumer.accept(utilities);
147143
}
@@ -247,11 +243,7 @@ public void execute(CredentialsCallbackInfo info) {
247243
if(licenseObtained){
248244
Utilities utilities = engine.getUtilities();
249245
ThirdPartyDependencyChecker.logAllDependencyInfo(utilities);
250-
251-
// Setup our shutdown hook in case user terminates before consumer returns
252-
logger.info("Adding shutdown hook for EngineWrapper::close");
253-
Runtime.getRuntime().addShutdownHook(shutdownHook);
254-
246+
255247
logger.info("License was obtained, providing Utilities object to consumer...");
256248
consumer.accept(utilities);
257249
} else {
@@ -342,10 +334,6 @@ public void execute(CredentialsCallbackInfo info) {
342334
if(licenseObtained){
343335
Utilities utilities = engine.getUtilities();
344336
ThirdPartyDependencyChecker.logAllDependencyInfo(utilities);
345-
346-
// Setup our shutdown hook in case user terminates before consumer returns
347-
logger.info("Adding shutdown hook for EngineWrapper::close");
348-
Runtime.getRuntime().addShutdownHook(shutdownHook);
349337

350338
logger.info("License was obtained, providing Utilities object to consumer...");
351339
consumer.accept(utilities);
@@ -431,8 +419,11 @@ private void configureAndBuildEngine(){
431419

432420
//Obtain an engine instance
433421
engine = container.newEngine(engineConfiguration);
434-
435422
logger.info("Obtained Engine instance v"+engine.getVersion());
423+
424+
// Setup our shutdown hook in case user terminates before consumer returns
425+
logger.info("Adding shutdown hook for EngineWrapper::close");
426+
Runtime.getRuntime().addShutdownHook(shutdownHook);
436427
}
437428

438429
/***

0 commit comments

Comments
 (0)