You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2021/05/11 03:59:59 UTC
[felix-dev] branch master updated: simplify write permission check
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new a66bfa1 simplify write permission check
a66bfa1 is described below
commit a66bfa19ba30409896ed46905be1922e6b7ac397
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Mon May 10 23:58:57 2021 -0400
simplify write permission check
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../org/apache/felix/fileinstall/internal/Util.java | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java
index 344175a..69fcaf4 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java
@@ -26,8 +26,6 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.attribute.PosixFilePermission;
import java.util.Collections;
import java.util.Set;
import java.util.jar.JarFile;
@@ -46,8 +44,6 @@ public class Util
{
private static final String CHECKSUM_SUFFIX = ".checksum";
- private static final boolean OS_WIN = System.getProperty("os.name").toLowerCase().contains("win");
-
/**
* Returns the log level as defined in the BundleContext or System properties.
* @param context {@link BundleContext} of the FileInstall bundle.
@@ -386,22 +382,6 @@ public class Util
}
public static boolean canWrite(File f) {
- if (!OS_WIN) {
- try {
- Set<PosixFilePermission> posixFilePermissions;
- posixFilePermissions = Files.getPosixFilePermissions(f.toPath());
-
- return posixFilePermissions.contains(PosixFilePermission.OWNER_WRITE) ||
- posixFilePermissions.contains(PosixFilePermission.GROUP_WRITE) ||
- posixFilePermissions.contains(PosixFilePermission.OTHERS_WRITE);
- }
- catch (IOException e) {
- logger.log(
- Logger.LOG_ERROR, Logger.LOG_ERROR,
- "Could not get POSIX file permissions for " + f.getAbsolutePath(), e);
- }
- }
-
return f.canWrite();
}