Merge pull request thinkgem#284 from QinChery/patch-5

Update StreamUtils.java
c825503724 · Jun 1, 2016 · 67099d2 · 67099d2
2 parents 3e7f463 + 9a4d03d
commit 67099d2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/thinkgem/jeesite/common/utils/StreamUtils.java b/src/main/java/com/thinkgem/jeesite/common/utils/StreamUtils.java
@@ -155,13 +155,15 @@ public static InputStream byteTOInputStream(byte[] in) throws Exception {
 	 */
 	public static String byteTOString(byte[] in) {
 
+		String result = null;
 		InputStream is = null;
 		try {
 			is = byteTOInputStream(in);
+			result = InputStreamTOString(is, "UTF-8");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return InputStreamTOString(is, "UTF-8");
+		return result;
 	}
 	/**
 	 * 将byte数组转换成String
@@ -274,4 +276,4 @@ public static ByteArrayOutputStream getByteArrayOutputStream() {
 		return new ByteArrayOutputStream();
 	}
 
-}
+}