Merge pull request #220 from warownia1/master

BobHanson · web-flow · commit 2d3424aa97ab · 2021-07-28T05:43:37.000-05:00
Fix SimpleHttpClient#toBytes, make sure return value is always byte[].
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/SimpleHttpClient.java b/sources/net.sf.j2s.java.core/src/javajs/http/SimpleHttpClient.java
@@ -287,22 +287,27 @@ public HttpRequest clearFormParts(String name) {
 		}
 
 		private byte[] toBytes(Object data) {
-			try {
-				if (data == null || data instanceof byte[]) {
-				} else if (data instanceof File) {
-					FileInputStream fis = new FileInputStream((File) data);
-					data = getBytes(fis);
-					fis.close();
-				} else if (data instanceof InputStream) {
-					InputStream is = (InputStream) data;
-					data = getBytes(is);
-					is.close();
-				} else {
-					data = data.toString().getBytes();
+			if (data == null || data instanceof byte[]) {
+				return (byte[]) data;
+			} else if (data instanceof File) {
+				try (FileInputStream fis = new FileInputStream((File) data)) {
+					return getBytes(fis);
 				}
-			} catch (IOException e) {
+				catch (IOException e) {
+					e.printStackTrace();
+					return null;
+				}
+			} else if (data instanceof InputStream) {
+				try (InputStream is = (InputStream) data) {
+					return getBytes(is);
+				}
+				catch (IOException e) {
+					e.printStackTrace();
+					return null;
+				}
+			} else {
+				return data.toString().getBytes();
 			}
-			return (byte[]) data;
 		}
 
 		@Override
