Skip to content

Commit dfc6cd9

Browse files
authored
[MBUILDCACHE-113] java.security.AccessController in java.security has been deprecated and marked for removal (#205)
* remove java.security manager related code - see also JEP 486 * remove java.security manager related code - see also JEP 486
1 parent bb7d853 commit dfc6cd9

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
import java.nio.ByteBuffer;
2424
import java.nio.channels.FileChannel;
2525
import java.nio.channels.FileChannel.MapMode;
26-
import java.security.PrivilegedAction;
2726

28-
import static java.security.AccessController.doPrivileged;
2927
import static org.apache.maven.buildcache.hash.ReflectionUtils.getField;
3028
import static org.apache.maven.buildcache.hash.ReflectionUtils.getMethod;
3129

@@ -34,14 +32,16 @@
3432
*/
3533
public class CloseableBuffer implements AutoCloseable {
3634

37-
private static final Cleaner CLEANER = doPrivileged((PrivilegedAction<Cleaner>) () -> {
35+
private static final Cleaner CLEANER = getJVMDependentCleaner();
36+
37+
private static Cleaner getJVMDependentCleaner() {
3838
final String jsv = System.getProperty("java.specification.version", "9");
3939
if (jsv.startsWith("1.")) {
4040
return DirectCleaner.isSupported() ? new DirectCleaner() : new NoopCleaner();
4141
} else {
4242
return UnsafeCleaner.isSupported() ? new UnsafeCleaner() : new NoopCleaner();
4343
}
44-
});
44+
}
4545

4646
public static CloseableBuffer directBuffer(int capacity) {
4747
return new CloseableBuffer(ByteBuffer.allocateDirect(capacity));
@@ -70,8 +70,7 @@ public ByteBuffer getBuffer() {
7070

7171
@Override
7272
public void close() {
73-
// Java 8: () -> CLEANER.clean(buffer)
74-
boolean done = doPrivileged((PrivilegedAction<Boolean>) () -> CLEANER.clean(buffer));
73+
boolean done = CLEANER.clean(buffer);
7574
if (done) {
7675
buffer = null;
7776
}

0 commit comments

Comments
 (0)