Merge pull request #65 from HelloFax/issue-64

Reset parameters, even if exception is thrown.

Author: Chris Paul

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.hellosign</groupId>
     <artifactId>hellosign-java-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>4.0.5</version>
+    <version>4.0.6</version>
     <name>HelloSign Java SDK</name>
     <url>https://github.com/HelloFax/hellosign-java-sdk</url>
     <properties>

src/main/java/com/hellosign/sdk/http/HttpClient.java

@@ -206,9 +206,10 @@ public JSONObject asJson() throws HelloSignException {
             json = new JSONObject(response);
         } catch (JSONException e) {
             throw new HelloSignException(e);
+        } finally {
+            reset();
         }
         validate(json);
-        reset();
         return json;
     }
 
@@ -222,14 +223,20 @@ public JSONObject asJson() throws HelloSignException {
      */
     public File asFile(String fileName) throws HelloSignException {
         Integer lastResponseCode = getLastResponseCode();
-        if (lastResponseCode != null && lastResponseCode != HttpURLConnection.HTTP_OK) {
-            this.asJson(); // Will validate response
-        }
-        File f = createTemporaryFile(fileName);
-        if (getLastResponseAsFile(f) == 0) {
-            logger.warn("No bytes written to file: " + fileName);
+        File f = null;
+        try {
+            if (lastResponseCode != null && lastResponseCode != HttpURLConnection.HTTP_OK) {
+                this.asJson(); // Will validate response
+            }
+            f = createTemporaryFile(fileName);
+            if (getLastResponseAsFile(f) == 0) {
+                logger.warn("No bytes written to file: " + fileName);
+            }
+        } catch (HelloSignException ex) {
+            throw ex;
+        } finally {
+            reset();
         }
-        reset();
         return f;
     }