From 64569f83abbb28bb617071f5cceedf8a0a9240b2 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sun, 5 Jul 2020 14:03:48 +0200 Subject: [PATCH] Optimize http client shutdown --- common/src/main/java/ctbrec/sites/bonga/BongaCams.java | 4 ++-- common/src/main/java/ctbrec/sites/cam4/Cam4.java | 6 ++++-- common/src/main/java/ctbrec/sites/camsoda/Camsoda.java | 4 ++-- .../src/main/java/ctbrec/sites/chaturbate/Chaturbate.java | 6 ++++-- common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java | 4 ++-- common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java | 6 ++++-- common/src/main/java/ctbrec/sites/stripchat/Stripchat.java | 4 ++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/bonga/BongaCams.java b/common/src/main/java/ctbrec/sites/bonga/BongaCams.java index 8f554f9b..ffb4d07b 100644 --- a/common/src/main/java/ctbrec/sites/bonga/BongaCams.java +++ b/common/src/main/java/ctbrec/sites/bonga/BongaCams.java @@ -108,7 +108,7 @@ public class BongaCams extends AbstractSite { @Override public HttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new BongaCamsHttpClient(); } return httpClient; @@ -116,7 +116,7 @@ public class BongaCams extends AbstractSite { @Override public void shutdown() { - if(httpClient != null) { + if (httpClient != null) { httpClient.shutdown(); } } diff --git a/common/src/main/java/ctbrec/sites/cam4/Cam4.java b/common/src/main/java/ctbrec/sites/cam4/Cam4.java index 0c169cdf..f099bfcd 100644 --- a/common/src/main/java/ctbrec/sites/cam4/Cam4.java +++ b/common/src/main/java/ctbrec/sites/cam4/Cam4.java @@ -72,7 +72,7 @@ public class Cam4 extends AbstractSite { @Override public HttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new Cam4HttpClient(); } return httpClient; @@ -80,7 +80,9 @@ public class Cam4 extends AbstractSite { @Override public void shutdown() { - getHttpClient().shutdown(); + if (httpClient != null) { + httpClient.shutdown(); + } } @Override diff --git a/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java b/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java index f52897d6..05f85bc1 100644 --- a/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java +++ b/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java @@ -90,7 +90,7 @@ public class Camsoda extends AbstractSite { @Override public HttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new CamsodaHttpClient(); } return httpClient; @@ -103,7 +103,7 @@ public class Camsoda extends AbstractSite { @Override public void shutdown() { - if(httpClient != null) { + if (httpClient != null) { httpClient.shutdown(); } } diff --git a/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java b/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java index be291b39..8b2f087a 100644 --- a/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java +++ b/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java @@ -89,7 +89,7 @@ public class Chaturbate extends AbstractSite { @Override public HttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new ChaturbateHttpClient(); } return httpClient; @@ -97,7 +97,9 @@ public class Chaturbate extends AbstractSite { @Override public void shutdown() { - getHttpClient().shutdown(); + if (httpClient != null) { + httpClient.shutdown(); + } } @Override diff --git a/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java b/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java index fbf73ab8..140a7e3e 100644 --- a/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java +++ b/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java @@ -73,7 +73,7 @@ public class Fc2Live extends AbstractSite { @Override public HttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new Fc2HttpClient(); } return httpClient; @@ -85,7 +85,7 @@ public class Fc2Live extends AbstractSite { @Override public void shutdown() { - if(httpClient != null) { + if (httpClient != null) { httpClient.shutdown(); } } diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java index 8346a1f6..dd4e2925 100644 --- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java +++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java @@ -89,7 +89,7 @@ public class MyFreeCams extends AbstractSite { @Override public MyFreeCamsHttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new MyFreeCamsHttpClient(); } return httpClient; @@ -97,7 +97,9 @@ public class MyFreeCams extends AbstractSite { @Override public void shutdown() { - httpClient.shutdown(); + if (httpClient != null) { + httpClient.shutdown(); + } } @Override diff --git a/common/src/main/java/ctbrec/sites/stripchat/Stripchat.java b/common/src/main/java/ctbrec/sites/stripchat/Stripchat.java index 07974847..7919ef23 100644 --- a/common/src/main/java/ctbrec/sites/stripchat/Stripchat.java +++ b/common/src/main/java/ctbrec/sites/stripchat/Stripchat.java @@ -87,7 +87,7 @@ public class Stripchat extends AbstractSite { @Override public HttpClient getHttpClient() { - if(httpClient == null) { + if (httpClient == null) { httpClient = new StripchatHttpClient(); } return httpClient; @@ -100,7 +100,7 @@ public class Stripchat extends AbstractSite { @Override public void shutdown() { - if(httpClient != null) { + if (httpClient != null) { httpClient.shutdown(); } }