This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new b30eaec65 fix: fix the get log, chinese messy code (#4233)
b30eaec65 is described below
commit b30eaec65ffede5e179d1264e5a5eeb3628fdc0d
Author: Jack Xu <[email protected]>
AuthorDate: Fri Feb 17 14:56:38 2023 +0800
fix: fix the get log, chinese messy code (#4233)
---
.../apache/linkis/ecm/server/operator/EngineConnLogOperator.scala | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
index 6c8c876c3..bc856ba68 100644
---
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
+++
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
@@ -32,7 +32,7 @@ import org.apache.commons.io.input.ReversedLinesFileReader
import org.apache.commons.lang3.StringUtils
import java.io.{File, RandomAccessFile}
-import java.nio.charset.Charset
+import java.nio.charset.{Charset, StandardCharsets}
import java.text.MessageFormat
import java.util
import java.util.Collections
@@ -83,7 +83,10 @@ class EngineConnLogOperator extends Operator with Logging {
}
def randomAndReversedReadLine(): String = {
if (null != randomReader) {
- randomReader.readLine()
+ val line = randomReader.readLine()
+ if (line != null) {
+ new String(line.getBytes(StandardCharsets.ISO_8859_1),
Charset.defaultCharset())
+ } else null
} else {
reversedReader.readLine()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
