From 313d3121dbba85f349f2537e3dd578df50fc9fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 15 Mar 2023 16:47:41 +0100 Subject: [PATCH] Remove workaround for Java < 7 --- .../print/servlet/ServletMapPrinterFactory.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java index 358f21f38c..109bbfc0b2 100644 --- a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java +++ b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java @@ -15,7 +15,6 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.nio.channels.ClosedByInterruptException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -129,17 +128,6 @@ public final synchronized MapPrinter create(@Nullable final String app) throws N printer.setConfiguration(configFile, bytes); this.printers.put(finalApp, printer); - } catch (ClosedByInterruptException e) { - // because of a bug in the JDK, the interrupted status might not be set - // when throwing a ClosedByInterruptException. so, we do it manually. - // see also http://bugs.java.com/view_bug.do?bug_id=7043425 - Thread.currentThread().interrupt(); - LOGGER.error( - "Error occurred while reading configuration file '{}', '{}'", configFile, e.getMessage() - ); - throw new RuntimeException(String.format( - "Error occurred while reading configuration file '%s': ", configFile), - e); } catch (Throwable e) { LOGGER.error( "Error occurred while reading configuration file '{}', '{}'", configFile, e.getMessage()