Replace AccessController.doPrivileged() w/ SecurityUtil.doPrivileged()

9 files changed, 9 insertions, 7 deletions

diff --git a/make/config/jogl/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java
index cc1fefd1a..f8238d7dd 100644
--- a/make/config/jogl/cg-common-CustomJavaCode.java
+++ b/make/config/jogl/cg-common-CustomJavaCode.java
@@ -7,7 +7,7 @@ static {
       throw new RuntimeException("Couldn't instantiate CgProcAddressTable");
     }
 
-    cgDynamicLookupHelper = AccessController.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() {
+    cgDynamicLookupHelper = SecurityUtil.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() {
                                 public DynamicLibraryBundle run() {
                                     return new DynamicLibraryBundle(new CgDynamicLibraryBundleInfo());
                                 } } );
diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg
index d6a5367a6..aba9a87d1 100644
--- a/make/config/jogl/cg-common.cfg
+++ b/make/config/jogl/cg-common.cfg
@@ -104,9 +104,9 @@ Ignore cgGetProgramOptions
 Import jogamp.opengl.*
 Import com.jogamp.common.os.DynamicLookupHelper
 Import com.jogamp.common.os.DynamicLibraryBundle
+Import com.jogamp.common.util.SecurityUtil
 Import com.jogamp.opengl.cg.CgDynamicLibraryBundleInfo
 Import java.security.PrivilegedAction
-Import java.security.AccessController
 
 #
 # NIODirectOnly directives for routines requiring them for semantic reasons
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index 2ade45c0e..f64a1f0bf 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -1,7 +1,7 @@
 private static boolean useJavaMipmapCode = true;
 
 static {
-  AccessController.doPrivileged(new PrivilegedAction() {
+  SecurityUtil.doPrivileged(new PrivilegedAction() {
       public Object run() {
         String val = System.getProperty("jogl.glu.nojava");
         if (val != null && !val.toLowerCase().equals("false")) {
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index 41a7e5b9b..b8d40e1f8 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -2,7 +2,7 @@
 private static boolean useJavaMipmapCode = true;
 
 static {
-  AccessController.doPrivileged(new PrivilegedAction() {
+  SecurityUtil.doPrivileged(new PrivilegedAction() {
       public Object run() {
         String val = System.getProperty("jogl.glu.nojava");
         if (val != null && !val.toLowerCase().equals("false")) {
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 7c8735ff1..c38f6a6b4 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -38,6 +38,7 @@ ManualStaticInitCall GLUgl2
 # GLU needs access to the GLUtesselatorImpl class for GLUtesselator,
 # to the Mipmap class for scaling and mipmap generation,
 # and to the nurbs.* package for the NURBS functionality
+Import com.jogamp.common.util.SecurityUtil
 Import jogamp.opengl.glu.nurbs.*
 Import java.security.*
 Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver
diff --git a/make/config/nativewindow/jawt-CustomJavaCode.java b/make/config/nativewindow/jawt-CustomJavaCode.java
index 6ea57dca2..16bce36e3 100644
--- a/make/config/nativewindow/jawt-CustomJavaCode.java
+++ b/make/config/nativewindow/jawt-CustomJavaCode.java
@@ -9,7 +9,7 @@ protected static boolean getJAWT(final JAWT jawt, final int jawt_version_flags)
     // Workaround for 4845371.
     // Make sure the first reference to the JNI GetDirectBufferAddress is done
     // from a privileged context so the VM's internal class lookups will succeed.
-    return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+    return SecurityUtil.doPrivileged(new PrivilegedAction<Boolean>() {
         public Boolean run() {
           jawt.setVersion(jawt_version_flags);
           if (JAWTFactory.JAWT_GetAWT(jawt)) {
diff --git a/make/config/nativewindow/jawt-common.cfg b/make/config/nativewindow/jawt-common.cfg
index 41129e630..adb6ce49b 100644
--- a/make/config/nativewindow/jawt-common.cfg
+++ b/make/config/nativewindow/jawt-common.cfg
@@ -25,5 +25,6 @@ import java.security.*
 import jogamp.nativewindow.jawt.*
 import com.jogamp.common.os.Platform
 import com.jogamp.common.util.VersionNumber
+Import com.jogamp.common.util.SecurityUtil
 
 IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java
diff --git a/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java b/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java
index 691a93a16..816974191 100644
--- a/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java
+++ b/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java
@@ -2,7 +2,7 @@
     static final DynamicLibraryBundle dynamicLookupHelper;
 
     static {
-        dynamicLookupHelper = AccessController.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() {
+        dynamicLookupHelper = SecurityUtil.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() {
                     public DynamicLibraryBundle run() {
                         final DynamicLibraryBundle bundle =  new DynamicLibraryBundle(new OVRDynamicLibraryBundleInfo());
                         if(null==bundle) {
diff --git a/make/config/oculusvr/oculusvr.cfg b/make/config/oculusvr/oculusvr.cfg
index d2d446f21..b2870e59a 100644
--- a/make/config/oculusvr/oculusvr.cfg
+++ b/make/config/oculusvr/oculusvr.cfg
@@ -5,7 +5,7 @@ Style AllStatic
 JavaClass OVR
 
 Import com.jogamp.oculusvr.*
-Import java.security.AccessController
+Import com.jogamp.common.util.SecurityUtil
 Import java.security.PrivilegedAction
 
 IncludeAs CustomJavaCode OVR oculusvr-ovr-CustomJavaCode.java