[XNIO-261] Use privileged action to construct service loaders

xnio · Feb 2, 2016 · be56b35 · be56b35
1 parent ee2dcdb
commit be56b35
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/api/src/main/java/org/xnio/Xnio.java b/api/src/main/java/org/xnio/Xnio.java
@@ -178,8 +178,12 @@ public static void checkBlockingAllowed() throws IllegalStateException {
      *
      * @since 3.0
      */
-    public static Xnio getInstance(ClassLoader classLoader) {
-        return doGetInstance(null, ServiceLoader.load(XnioProvider.class, classLoader));
+    public static Xnio getInstance(final ClassLoader classLoader) {
+        return doGetInstance(null, doPrivileged(new PrivilegedAction<ServiceLoader<XnioProvider>>() {
+            public ServiceLoader<XnioProvider> run() {
+                return ServiceLoader.load(XnioProvider.class, classLoader);
+            }
+        }));
     }
 
     /**
@@ -191,7 +195,11 @@ public static Xnio getInstance(ClassLoader classLoader) {
      * @since 3.0
      */
     public static Xnio getInstance() {
-        return doGetInstance(null, ServiceLoader.load(XnioProvider.class, Xnio.class.getClassLoader()));
+        return doGetInstance(null, doPrivileged(new PrivilegedAction<ServiceLoader<XnioProvider>>() {
+            public ServiceLoader<XnioProvider> run() {
+                return ServiceLoader.load(XnioProvider.class, Xnio.class.getClassLoader());
+            }
+        }));
     }
 
     /**
@@ -203,8 +211,12 @@ public static Xnio getInstance() {
      *
      * @since 3.0
      */
-    public static Xnio getInstance(String provider, ClassLoader classLoader) {
-        return doGetInstance(provider, ServiceLoader.load(XnioProvider.class, classLoader));
+    public static Xnio getInstance(String provider, final ClassLoader classLoader) {
+        return doGetInstance(provider, doPrivileged(new PrivilegedAction<ServiceLoader<XnioProvider>>() {
+            public ServiceLoader<XnioProvider> run() {
+                return ServiceLoader.load(XnioProvider.class, classLoader);
+            }
+        }));
     }
 
     /**
@@ -216,7 +228,11 @@ public static Xnio getInstance(String provider, ClassLoader classLoader) {
      * @since 3.0
      */
     public static Xnio getInstance(String provider) {
-        return doGetInstance(provider, ServiceLoader.load(XnioProvider.class, Xnio.class.getClassLoader()));
+        return doGetInstance(provider, doPrivileged(new PrivilegedAction<ServiceLoader<XnioProvider>>() {
+            public ServiceLoader<XnioProvider> run() {
+                return ServiceLoader.load(XnioProvider.class, Xnio.class.getClassLoader());
+            }
+        }));
     }
 
     private static Xnio doGetInstance(final String provider, final ServiceLoader<XnioProvider> serviceLoader) {