From 131713aaf423cfe19962c0e2dd88453a7b523463 Mon Sep 17 00:00:00 2001
From: tesshucom <webmaster@tesshu.com>
Date: Fri, 5 Apr 2019 21:46:12 -0400
Subject: [PATCH] With Jetty

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
---
 airsonic-main/pom.xml                                  |  3 ++-
 .../airsonic/player/controller/StreamController.java   | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml
index b0842afc..ad6e8d02 100755
--- a/airsonic-main/pom.xml
+++ b/airsonic-main/pom.xml
@@ -332,6 +332,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <!-- UPNP / DLNA -->
@@ -539,7 +540,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.2.RELEASE</version>
+                <version>1.5.8.RELEASE</version>
                 <configuration>
                     <mainClass>org.airsonic.player.Application</mainClass>
                     <layout>WAR</layout>
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
index 7a038637..1a40a656 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
@@ -29,7 +29,6 @@ import org.airsonic.player.service.sonos.SonosHelper;
 import org.airsonic.player.util.HttpRange;
 import org.airsonic.player.util.StringUtil;
 import org.airsonic.player.util.Util;
-import org.apache.catalina.connector.ClientAbortException;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -249,9 +248,12 @@ public class StreamController  {
                     }
                 }
             }
-        } catch (ClientAbortException err) {
-            LOG.info("org.apache.catalina.connector.ClientAbortException: Connection reset");
-            return;
+        } catch (Exception err) {
+            if("org.apache.catalina.connector.ClientAbortException".equals(err.getClass().getName())) {
+                LOG.info("org.apache.catalina.connector.ClientAbortException: Connection reset");
+                return;
+            }
+            LOG.error("Error occurred in handleRequest.", err);
         } finally {
             if (status != null) {
                 securityService.updateUserByteCounts(user, status.getBytesTransfered(), 0L, 0L);