You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2013/07/03 12:52:59 UTC
svn commit: r1499317 -
/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
Author: kahatlen
Date: Wed Jul 3 10:52:59 2013
New Revision: 1499317
URL: http://svn.apache.org/r1499317
Log:
DERBY-6287: Don't use reflection to call Java 6 methods in FileUtil
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java?rev=1499317&r1=1499316&r2=1499317&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java Wed Jul 3 10:52:59 2013
@@ -594,13 +594,7 @@ nextFile: for (int i = 0; i < list.lengt
private static final Object region = new Object();
private static boolean initialized = false;
- // Reflection helper objects for calling into Java >= 6
- private static Method setWrite = null;
- private static Method setRead = null;
- private static Method setExec = null;
-
// Reflection helper objects for calling into Java >= 7
- private static Class<File> fileClz = File.class;
private static Class<?> filesClz;
private static Class<?> pathClz;
private static Class<?> pathsClz;
@@ -621,10 +615,7 @@ nextFile: for (int i = 0; i < list.lengt
private static Method supportsFileAttributeView;
private static Method getFileStore;
private static Method getOwner;
- private static Method getAcl;
private static Method setAcl;
- private static Method principal;
- private static Method getName;
private static Method build;
private static Method newBuilder;
private static Method setPrincipal;
@@ -633,8 +624,9 @@ nextFile: for (int i = 0; i < list.lengt
private static Method setPermissions;
private static Field allow;
+
/**
- * Use when creating new files. If running with Java 6 or higher on Unix,
+ * Use when creating new files. If running on Unix,
* limit read and write permissions on {@code file} to owner if {@code
* derby.storage.useDefaultFilePermissions == false}.
* <p/>
@@ -678,20 +670,6 @@ nextFile: for (int i = 0; i < list.lengt
synchronized (region) {
if (!initialized) {
initialized = true;
- // >= Java 6
- try {
- setWrite = fileClz.getMethod(
- "setWritable",
- new Class[]{Boolean.TYPE, Boolean.TYPE});
- setRead = fileClz.getMethod(
- "setReadable",
- new Class[]{Boolean.TYPE, Boolean.TYPE});
- setExec = fileClz.getMethod(
- "setExecutable",
- new Class[]{Boolean.TYPE, Boolean.TYPE});
- } catch (NoSuchMethodException e) {
- // not Java 6 or higher
- }
// >= Java 7
try {
@@ -738,14 +716,8 @@ nextFile: for (int i = 0; i < list.lengt
getOwner = filesClz.
getMethod("getOwner",
new Class[]{pathClz, linkOptionArrayClz});
- getAcl = aclFileAttributeViewClz.
- getMethod("getAcl", new Class[]{});
setAcl = aclFileAttributeViewClz.
getMethod("setAcl", new Class[]{List.class});
- principal = aclEntryClz.
- getMethod("principal", new Class[]{});
- getName = userPrincipalClz.
- getMethod("getName", new Class[]{});
build = aclEntryBuilderClz.
getMethod("build", new Class[]{});
newBuilder = aclEntryClz.
@@ -772,88 +744,50 @@ nextFile: for (int i = 0; i < list.lengt
}
}
- if (setWrite == null) {
- // JVM level too low
- return;
- }
-
if (limitAccessToOwnerViaACLs(file)) {
return;
}
- try {
- //
- // First switch off all write access
- //
- Object r;
+ //
+ // First switch off all write access
+ //
+ assertTrue(file.setWritable(false, false));
- r = setWrite.invoke(
- file,
- new Object[]{Boolean.FALSE, Boolean.FALSE});
- assertTrue(r);
+ //
+ // Next, switch on write again, but for owner only
+ //
+ assertTrue(file.setWritable(true, true));
- //
- // Next, switch on write again, but for owner only
- //
- r = setWrite.invoke(
- file,
- new Object[]{Boolean.TRUE, Boolean.TRUE});
- assertTrue(r);
+ //
+ // First switch off all read access
+ //
+ assertTrue(file.setReadable(false, false));
+
+ //
+ // Next, switch on read access again, but for owner only
+ //
+ assertTrue(file.setReadable(true, true));
+ if (file.isDirectory()) {
//
- // First switch off all read access
+ // First switch off all exec access
//
- r = setRead.invoke(
- file,
- new Object[]{Boolean.FALSE, Boolean.FALSE});
- assertTrue(r);
+ assertTrue(file.setExecutable(false, false));
//
- // Next, switch on read access again, but for owner only
+ // Next, switch on exec again, but for owner only
//
- r = setRead.invoke(
- file,
- new Object[]{Boolean.TRUE, Boolean.TRUE});
- assertTrue(r);
-
-
- if (file.isDirectory()) {
- //
- // First switch off all exec access
- //
- r = setExec.invoke(
- file,
- new Object[]{Boolean.FALSE, Boolean.FALSE});
- assertTrue(r);
-
- //
- // Next, switch on read exec again, but for owner only
- //
- r = setExec.invoke(
- file,
- new Object[]{Boolean.TRUE, Boolean.TRUE});
- assertTrue(r);
- }
- } catch (InvocationTargetException e) {
- // setWritable/setReadable can throw SecurityException
- throw (SecurityException)e.getCause();
- } catch (IllegalAccessException e) {
- // coding error
- if (SanityManager.DEBUG) {
- SanityManager.THROWASSERT(e);
- }
+ assertTrue(file.setExecutable(true, true));
}
}
- private static void assertTrue(Object r){
+ private static void assertTrue(boolean b) {
// We should always have the permission to modify the access since have
// just created the file. On some file systems, some operations will
// not work, though, notably FAT/FAT32, as well as NTFS on java < 7, so
// we ignore it the failure.
if (SanityManager.DEBUG) {
- Boolean b = (Boolean)r;
-
- if (!b.booleanValue()) {
+ if (!b) {
String os =
PropertyUtil.getSystemProperty("os.name").toLowerCase();