geforkt von Mirrors/Velocity
remove access controller (#1306)
Dieser Commit ist enthalten in:
Ursprung
f98c522fa6
Commit
2534412be4
@ -74,9 +74,7 @@ import java.net.InetSocketAddress;
|
||||
import java.net.http.HttpClient;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.security.AccessController;
|
||||
import java.security.KeyPair;
|
||||
import java.security.PrivilegedAction;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Locale;
|
||||
@ -522,8 +520,8 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
||||
// makes sure that all the disconnect events are being fired
|
||||
|
||||
CompletableFuture<Void> playersTeardownFuture = CompletableFuture.allOf(players.stream()
|
||||
.map(ConnectedPlayer::getTeardownFuture)
|
||||
.toArray((IntFunction<CompletableFuture<Void>[]>) CompletableFuture[]::new));
|
||||
.map(ConnectedPlayer::getTeardownFuture)
|
||||
.toArray((IntFunction<CompletableFuture<Void>[]>) CompletableFuture[]::new));
|
||||
|
||||
playersTeardownFuture.get(10, TimeUnit.SECONDS);
|
||||
} catch (TimeoutException e) {
|
||||
@ -552,14 +550,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
||||
shutdown = true;
|
||||
|
||||
if (explicitExit) {
|
||||
AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||
@Override
|
||||
@SuppressFBWarnings("DM_EXIT")
|
||||
public Void run() {
|
||||
System.exit(0);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
System.exit(0);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -38,8 +38,6 @@ import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.security.AccessController;
|
||||
import java.security.PrivilegedAction;
|
||||
import java.util.HashSet;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
@ -92,8 +90,7 @@ public class JavaPluginLoader implements PluginLoader {
|
||||
URL pluginJarUrl = candidate.getSource().orElseThrow(
|
||||
() -> new InvalidPluginException("Description provided does not have a source path")
|
||||
).toUri().toURL();
|
||||
PluginClassLoader loader = AccessController.doPrivileged(
|
||||
(PrivilegedAction<PluginClassLoader>) () -> new PluginClassLoader(new URL[]{pluginJarUrl}));
|
||||
PluginClassLoader loader = new PluginClassLoader(new URL[]{pluginJarUrl});
|
||||
loader.addToClassloaders();
|
||||
|
||||
JavaVelocityPluginDescriptionCandidate candidateInst =
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren