From 2b7bb59d1255c3027257bc5ba76d4b14c4a24463 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 14 Mar 2021 22:07:45 +0800
Subject: [PATCH] !49 修复Byte[]类型参数死循环的问题 Merge pull request !49 from 周艺峰/master
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index 1c87e75..aa7c436 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -797,7 +797,17 @@
}
else if (obj instanceof byte[] || obj instanceof Byte[])
{
- return str((Byte[]) obj, charset);
+ if (obj instanceof byte[]){
+ return str((byte[]) obj, charset);
+ } else {
+ Byte[] bytes = (Byte[])obj;
+ int length = bytes.length;
+ byte[] dest = new byte[length];
+ for (int i = 0; i < length; i++) {
+ dest[i] = bytes[i];
+ }
+ return str (dest,charset);
+ }
}
else if (obj instanceof ByteBuffer)
{
--
Gitblit v1.9.3