Ver código fonte

Merge pull request #323 from csmith/master

Disable the security manager.
pull/324/head
Greg Holmes 9 anos atrás
pai
commit
be4762fb33
1 arquivos alterados com 2 adições e 1 exclusões
  1. 2
    1
      src/com/dmdirc/Main.java

+ 2
- 1
src/com/dmdirc/Main.java Ver arquivo

@@ -49,7 +49,6 @@ import com.dmdirc.ui.WarningDialog;
49 49
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
50 50
 
51 51
 import java.awt.GraphicsEnvironment;
52
-import java.security.Policy;
53 52
 import java.util.Collection;
54 53
 import java.util.HashSet;
55 54
 import java.util.List;
@@ -140,6 +139,7 @@ public class Main {
140 139
     @SuppressWarnings("PMD.AvoidCatchingThrowable")
141 140
     public static void main(final String... args) {
142 141
 
142
+        /* TODO: Make this not break reflection from plugins...
143 143
         try {
144 144
             Policy.setPolicy(new DMDircSecurityPolicy());
145 145
             System.setSecurityManager(new SecurityManager());
@@ -147,6 +147,7 @@ public class Main {
147 147
             System.err.println("Unable to set security policy: " + ex.getMessage());
148 148
             ex.printStackTrace();
149 149
         }
150
+        */
150 151
 
151 152
         try {
152 153
             final ClientModule clientModule = new ClientModule();

Carregando…
Cancelar
Salvar