Port #392 to 3.1.x

Author: tjcelaya

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project aims to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.1.8] - 2017-01-11
+ - [Underlying stream is not closed when we throw a `MantaClientEncryptionException`](https://github.com/joyent/java-manta/issues/391)
+ - [Underlying stream is not closed by `MantaEncryptedObjectInputStream` for range requests with certain ciphers](https://github.com/joyent/java-manta/issues/398)
+ - [MantaDirectoryListingIterator is not closed in MantaClient#listObjects when directory is empty](https://github.com/joyent/java-manta/issues/400)
+
 ## [3.1.7] - 2017-11-29
 ### Added
  - [Recursive directory creation](https://github.com/joyent/java-manta/issues/371)

java-manta-client/src/main/java/com/joyent/manta/http/EncryptionHttpHelper.java

@@ -48,10 +48,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.SecretKey;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
@@ -66,6 +62,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.SecretKey;
 
 /**
  * {@link HttpHelper} implementation that transparently handles client-side
@@ -291,9 +291,19 @@ public MantaObjectInputStream httpRequestAsInputStream(final HttpUriRequest requ
                         + "client-side encryption is enabled unless the "
                         + "permit unencrypted downloads configuration setting "
                         + "is enabled";
-                MantaClientEncryptionException e = new MantaClientEncryptionException(msg);
-                HttpHelper.annotateContextedException(e, request, response);
-                throw e;
+                MantaClientEncryptionException mcee = new MantaClientEncryptionException(msg);
+                HttpHelper.annotateContextedException(mcee, request, response);
+
+                try {
+                    rawStream.close();
+                } catch (IOException ioe) {
+                    MantaIOException mioe = new MantaIOException(ioe);
+                    HttpHelper.annotateContextedException(mioe, request, response);
+                    LOGGER.warn("Error closing underlying stream", mioe);
+                }
+
+                throw mcee;
+
             }
         }