MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

With Jetty

Browse Source 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
tesshucom
2019-04-05 21:57:39 -04:00
committed by Andrew DeMaria
parent 4cd9e9deac
commit 131713aaf4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/pom.xml
+2 -1
View File
@@ -332,6 +332,7 @@
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency> </dependency>
<!-- UPNP / DLNA --> <!-- UPNP / DLNA -->
@@ -539,7 +540,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.2.RELEASE</version> <version>1.5.8.RELEASE</version>
<configuration> <configuration>
<mainClass>org.airsonic.player.Application</mainClass> <mainClass>org.airsonic.player.Application</mainClass>
<layout>WAR</layout> <layout>WAR</layout>
airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
+4 -2
View File
@@ -29,7 +29,6 @@ import org.airsonic.player.service.sonos.SonosHelper;
import org.airsonic.player.util.HttpRange; import org.airsonic.player.util.HttpRange;
import org.airsonic.player.util.StringUtil; import org.airsonic.player.util.StringUtil;
import org.airsonic.player.util.Util; import org.airsonic.player.util.Util;
import org.apache.catalina.connector.ClientAbortException;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -249,9 +248,12 @@ public class StreamController {
} }
} }
} }
} catch (ClientAbortException err) { } catch (Exception err) {
if("org.apache.catalina.connector.ClientAbortException".equals(err.getClass().getName())) {
LOG.info("org.apache.catalina.connector.ClientAbortException: Connection reset"); LOG.info("org.apache.catalina.connector.ClientAbortException: Connection reset");
return; return;
}
LOG.error("Error occurred in handleRequest.", err);
} finally { } finally {
if (status != null) { if (status != null) {
securityService.updateUserByteCounts(user, status.getBytesTransfered(), 0L, 0L); securityService.updateUserByteCounts(user, status.getBytesTransfered(), 0L, 0L);