You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/10/13 12:16:29 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat: remove the use of com.sun.jna (#3643)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 18e81d5d4 feat: remove the use of com.sun.jna (#3643)
18e81d5d4 is described below
commit 18e81d5d4afb62f4b29705939a881fd5182753c8
Author: Jack Xu <xu...@126.com>
AuthorDate: Thu Oct 13 20:16:22 2022 +0800
feat: remove the use of com.sun.jna (#3643)
---
.../main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java | 1 +
.../scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
index 099572b6e..d7452aa8e 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
@@ -443,6 +443,7 @@ public class LocalFileSystem extends FileSystem {
throw new IOException("only owner can rename path " + path);
}
+ @Override
public void close() throws IOException {}
/** Utils method start */
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala
index 754fe08f4..831a96fd2 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala
+++ b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala
@@ -20,13 +20,14 @@ package org.apache.linkis.filesystem.utils
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.filesystem.conf.WorkSpaceConfiguration
+import org.apache.commons.lang3.SystemUtils
+
import java.util
import java.util.concurrent.TimeUnit
import java.util.concurrent.locks.ReentrantReadWriteLock
import scala.collection.mutable.ArrayBuffer
-import com.sun.jna.Platform
import oshi.util.{ExecutingCommand, FileUtil}
/**
@@ -61,7 +62,7 @@ class UserGroupInfo extends Logging {
private def refreshUserMap(): Unit = {
val tmpUsers = new ArrayBuffer[String]()
var passwd: util.List[String] = null
- if (Platform.isAIX) passwd = FileUtil.readFile("/etc/passwd")
+ if (SystemUtils.IS_OS_AIX) passwd = FileUtil.readFile("/etc/passwd")
else passwd = ExecutingCommand.runNative("getent passwd")
val iterator = passwd.iterator
while (iterator.hasNext) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org