Consistent handling of InterruptedException (plus setSchedulerFactory)

Issue: SPR-16479
Issue: SPR-16439

(cherry picked from commit 39201ad)
This commit is contained in:
Juergen Hoeller
2018-02-10 13:03:33 +01:00
parent 2654dbfcf1
commit 33d655a634
6 changed files with 109 additions and 76 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -514,8 +514,8 @@ public abstract class AbstractEntityManagerFactoryBean implements
return this.nativeEntityManagerFactoryFuture.get();
}
catch (InterruptedException ex) {
throw new IllegalStateException("Interrupted during initialization of native EntityManagerFactory: " +
ex.getMessage());
Thread.currentThread().interrupt();
throw new IllegalStateException("Interrupted during initialization of native EntityManagerFactory", ex);
}
catch (ExecutionException ex) {
throw new IllegalStateException("Failed to asynchronously initialize native EntityManagerFactory: " +