SimpleHttpClient merge and unnec. "else " removed

BobHanson · BobHanson · commit 739f5c7a415d · 2021-07-28T10:26:12.000-05:00
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
@@ -289,25 +289,26 @@ public HttpRequest clearFormParts(String name) {
 		private byte[] toBytes(Object data) {
 			if (data == null || data instanceof byte[]) {
 				return (byte[]) data;
-			} else if (data instanceof File) {
+			} 
+			if (data instanceof File) {
 				try (FileInputStream fis = new FileInputStream((File) data)) {
 					return getBytes(fis);
 				}
 				catch (IOException e) {
 					e.printStackTrace();
 					return null;
 				}
-			} else if (data instanceof InputStream) {
+			} 
+			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 data.toString().getBytes();
 		}
 
 		@Override

Original file line number	Diff line number	Diff line change
`@@ -289,25 +289,26 @@ public HttpRequest clearFormParts(String name) {`
`289`	`289`	`private byte[] toBytes(Object data) {`
`290`	`290`	`if (data == null \|\| data instanceof byte[]) {`
`291`	`291`	`return (byte[]) data;`
`292`		`- } else if (data instanceof File) {`
	`292`	`+ }`
	`293`	`+ if (data instanceof File) {`
`293`	`294`	`try (FileInputStream fis = new FileInputStream((File) data)) {`
`294`	`295`	`return getBytes(fis);`
`295`	`296`	`}`
`296`	`297`	`catch (IOException e) {`
`297`	`298`	`e.printStackTrace();`
`298`	`299`	`return null;`
`299`	`300`	`}`
`300`		`- } else if (data instanceof InputStream) {`
	`301`	`+ }`
	`302`	`+ if (data instanceof InputStream) {`
`301`	`303`	`try (InputStream is = (InputStream) data) {`
`302`	`304`	`return getBytes(is);`
`303`	`305`	`}`
`304`	`306`	`catch (IOException e) {`
`305`	`307`	`e.printStackTrace();`
`306`	`308`	`return null;`
`307`	`309`	`}`
`308`		`- } else {`
`309`		`- return data.toString().getBytes();`
`310`	`310`	`}`
	`311`	`+ return data.toString().getBytes();`
`311`	`312`	`}`
`312`	`313`
`313`	`314`	`@Override`