From 46d806df1ddf6a80a9b8001f34e80b371dc1f4b6 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 1 Sep 2019 17:04:58 +0200 Subject: [PATCH] Fix two issues found by LGTM --- .../main/java/org/airsonic/player/ajax/PlayQueueService.java | 2 +- .../player/spring/RegisterPrecompiledJSPInitializer.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java index 38c0ea83..13cf83a4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java @@ -745,7 +745,7 @@ public class PlayQueueService { List entries = new ArrayList<>(); for (InternetRadioSource streamSource: internetRadioService.getInternetRadioSources(radio)) { // Fake entry id so that the source can be selected in the UI - Integer streamId = -(1 + entries.size()); + int streamId = -(1 + entries.size()); Integer streamTrackNumber = entries.size(); String streamUrl = streamSource.getStreamUrl(); entries.add(new PlayQueueInfo.Entry( diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java b/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java index 3dde3681..835d38ab 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java @@ -64,6 +64,9 @@ public class RegisterPrecompiledJSPInitializer implements ServletContextInitiali jaxbContext = new JAXBDataBinding(WebApp.class).getContext(); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); WebApp webapp = (WebApp) unmarshaller.unmarshal(webXmlIS); + try { + webXmlIS.close(); + } catch (java.io.IOException e) {} return webapp; } catch (JAXBException e) { throw new RuntimeException("Could not parse precompiled-jsp-web.xml", e);