thelilfrog/EndPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix empty response error

Browse Source
This commit is contained in:
Alexis Delhaie
2021-01-15 11:57:19 +01:00
parent d17133bdbd
commit 82fc930c02
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@@ -6,12 +6,26 @@
<groupId>ovh.alexisdelhaie</groupId>
<artifactId>EndPoint</artifactId>
<version>0.1.3</version>
<version>0.1.5.3</version>
<packaging>jar</packaging>
<properties>
<maven.compiler.release>15</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>15</release>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>

2
src/main/java/ovh/alexisdelhaie/endpoint/configuration/AboutDialog.java
View File

@@ -13,7 +13,7 @@ public class AboutDialog extends JDialog {
public static final int WIDTH = 740;
public static final int HEIGHT = 500;
public static final String VERSION = "0.1.5.2";
public static final String VERSION = "0.1.5.3";
private JPanel contentPane;
private JLabel version;

3
src/main/java/ovh/alexisdelhaie/endpoint/http/HttpClient.java
View File

@@ -1,6 +1,7 @@
package ovh.alexisdelhaie.endpoint.http;
import ovh.alexisdelhaie.endpoint.configuration.ConfigurationProperties;
import ovh.alexisdelhaie.endpoint.utils.MessageDialog;
import javax.net.ssl.*;
import java.io.BufferedInputStream;
@@ -88,6 +89,8 @@ public class HttpClient {
long time = end.toEpochMilli() - start.toEpochMilli();
r.setRawRequest(request);
return Optional.of(new Response(b, time, downgraded, r));
} catch (Exception e) {
MessageDialog.error("HTTP Error", e.getMessage());
} finally {
s.close();
}

14
src/main/java/ovh/alexisdelhaie/endpoint/http/Response.java
View File

@@ -29,14 +29,18 @@ public class Response {
headers = new HashMap<>();
rawResponse = new String(res, StandardCharsets.UTF_8);
int crlf = rawResponse.indexOf(DOUBLE_CRLF);
rawHeaders = rawResponse.substring(0, crlf);
parseHeaders();
rawResponse = new String(res, getEncoding());
body = rawResponse.substring(crlf + DOUBLE_CRLF.length());
if (crlf > 0) {
rawHeaders = rawResponse.substring(0, crlf);
parseHeaders();
rawResponse = new String(res, getEncoding());
body = rawResponse.substring(crlf + DOUBLE_CRLF.length());
parseBody();
} else {
rawHeaders = rawResponse;
}
this.time = time;
request = r;
this.downgraded = downgraded;
parseBody();
}
private void parseHeaders() {