catch SocketException treat like ConnectionClosedException

Author: robotdan

build.savant

@@ -19,7 +19,7 @@ dropWizardVersion = "3.2.6"
 easyMockVersion = "5.2.0"
 freemarkerVersion = "2.3.32"
 fusionAuthJWTVersion = "5.3.2"
-javaHTTPVersion = "1.1.0"
+javaHTTPVersion = "1.1.2-{integration}"
 jsonPatchVersion = "1.13.0"
 guavaVersion = "32.1.2-jre"
 guiceVersion = "6.0.0"
@@ -29,7 +29,7 @@ logbackVersion = "1.5.13"
 slf4jVersion = "2.0.13"
 testngVersion = "7.8.0"
 
-project(group: "org.primeframework", name: "prime-mvc", version: "5.3.1", licenses: ["ApacheV2_0"]) {
+project(group: "org.primeframework", name: "prime-mvc", version: "5.3.2", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       // Dependency resolution order:

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>org.primeframework</groupId>
   <artifactId>prime-mvc</artifactId>
-  <version>5.3.1</version>
+  <version>5.3.2</version>
   <packaging>jar</packaging>
 
   <name>FusionAuth App</name>
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>io.fusionauth</groupId>
       <artifactId>java-http</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.2-{integration}</version>
       <type>jar</type>
       <scope>compile</scope>
       <optional>false</optional>

prime-mvc.iml

@@ -126,11 +126,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/.savant/cache/io/fusionauth/java-http/1.1.0/java-http-1.1.0.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/io/fusionauth/java-http/1.1.2-{integration}/java-http-1.1.2-{integration}.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/.savant/cache/io/fusionauth/java-http/1.1.0/java-http-1.1.0-src.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/io/fusionauth/java-http/1.1.2-{integration}/java-http-1.1.2-{integration}-src.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

src/main/java/org/primeframework/mvc/PrimeMVCRequestHandler.java

@@ -16,6 +16,7 @@
 package org.primeframework.mvc;
 
 import java.io.Closeable;
+import java.net.SocketException;
 
 import com.google.inject.Injector;
 import io.fusionauth.http.HTTPMethod;
@@ -71,9 +72,9 @@ public void handle(HTTPRequest request, HTTPResponse response) throws Exception
 
     try {
       injector.getInstance(MVCWorkflow.class).perform(null);
-    } catch (ConnectionClosedException e) {
-      response.setStatus(408);
-      logger.debug("Connection closed. This is generally caused due to a timeout, or a slow connection.", e);
+    } catch (ConnectionClosedException | SocketException e) {
+      // Catch, ignore and let java-http handle
+      throw e;
     } catch (Throwable t) {
       logger.error("Error encountered", t);
       throw t; // java-http will cause this error to write back a 500 if possible and close the socket