From b8535b62b627c5e14e12f68431ffeffbd9422aea Mon Sep 17 00:00:00 2001
From: "Vyacheslav N. Boyko" <mail4bvn@gmail.com>
Date: Thu, 22 Jun 2017 14:40:11 +0300
Subject: [PATCH] more catch

---
 pom.xml                                       |  2 +-
 .../licenseserverjclient/LicenseChecker.java  | 44 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index bc445ce..60c5db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ru.bvn13</groupId>
     <artifactId>licenseserverjclient</artifactId>
-    <version>1.3</version>
+    <version>1.4</version>
 
 
     <name>LicenseServerJClient</name>
diff --git a/src/main/java/ru/bvn13/licenseserverjclient/LicenseChecker.java b/src/main/java/ru/bvn13/licenseserverjclient/LicenseChecker.java
index abc51a0..0cb7485 100644
--- a/src/main/java/ru/bvn13/licenseserverjclient/LicenseChecker.java
+++ b/src/main/java/ru/bvn13/licenseserverjclient/LicenseChecker.java
@@ -28,33 +28,31 @@ public class LicenseChecker {
 
     public CheckClientLicenseResponse.Response checkLicense(String properties) {
 
-        URL url = null;
         try {
-            url = new URL("http://licenseserverj.cf/ws/checkLicense?WSDL");
+            URL url = new URL("http://licenseserverj.cf/ws/checkLicense?WSDL");
+
+            QName qname = new QName("http://checkLicenseJ.bvn13.ru", "CheckLicenseWSService");
+
+            Service service = Service.create(url, qname);
+
+            CheckLicenseWS checkLicenseWS = service.getPort(CheckLicenseWS.class);
+
+            CheckClientLicense.Request params = new CheckClientLicense.Request();
+            params.setClientId(clientId);
+            params.setProperties(properties);
+
+            CheckClientLicenseResponse.Response result = checkLicenseWS.checkClientLicense(params);
+
+            return result;
         } catch (MalformedURLException e) {
+            CheckClientLicenseResponse.Response result = new CheckClientLicenseResponse.Response();
+            result.setClientId(this.clientId);
+            result.setProperties("error");
+            result.setValid(false);
+
             e.printStackTrace();
-            return null;
+            return result;
         }
-
-        QName qname = new QName("http://checkLicenseJ.bvn13.ru", "CheckLicenseWSService");
-
-        Service service = null;
-        try {
-            service = Service.create(url, qname);
-        } catch (WebServiceException e) {
-            e.printStackTrace();
-            return null;
-        }
-
-        CheckLicenseWS checkLicenseWS = service.getPort(CheckLicenseWS.class);
-
-        CheckClientLicense.Request params = new CheckClientLicense.Request();
-        params.setClientId(clientId);
-        params.setProperties(properties);
-
-        CheckClientLicenseResponse.Response result = checkLicenseWS.checkClientLicense(params);
-
-        return result;
     }
 
 }