From f0ac928d212f74a2a422af2e89ec930c7b42e224 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 9 Jul 2023 14:50:30 +0200
Subject: Use GlueGen's SecurityUtil.doPrivileged(..) instead of
 AccessController, remove dead code

---
 make/config/joal-al-CustomJavaCode.java            | 5 +----
 make/config/joal-alcabstract-CustomJavaCode.java   | 5 +----
 make/config/joal-alextabstract-CustomJavaCode.java | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/make/config/joal-al-CustomJavaCode.java b/make/config/joal-al-CustomJavaCode.java
index 312a23d..9439a48 100644
--- a/make/config/joal-al-CustomJavaCode.java
+++ b/make/config/joal-al-CustomJavaCode.java
@@ -7,12 +7,9 @@ static {
       throw new RuntimeException("Couldn't instantiate ALProcAddressTable");
     }
 
-    alDynamicLookupHelper = AccessController.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() {
+    alDynamicLookupHelper = SecurityUtil.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() {
                                 public DynamicLibraryBundle run() {
                                     final DynamicLibraryBundle bundle =  new DynamicLibraryBundle(new ALDynamicLibraryBundleInfo());
-                                    if(null==bundle) {
-                                      throw new RuntimeException("Null ALDynamicLookupHelper");
-                                    }
                                     if(!bundle.isToolLibLoaded()) {
                                       throw new RuntimeException("Couln't load native AL library");
                                     }
diff --git a/make/config/joal-alcabstract-CustomJavaCode.java b/make/config/joal-alcabstract-CustomJavaCode.java
index aaa6464..b41c71f 100644
--- a/make/config/joal-alcabstract-CustomJavaCode.java
+++ b/make/config/joal-alcabstract-CustomJavaCode.java
@@ -1,12 +1,9 @@
 private static final ALCProcAddressTable alcProcAddressTable;
 
 static {
-    alcProcAddressTable = AccessController.doPrivileged(new PrivilegedAction<ALCProcAddressTable>() {
+    alcProcAddressTable = SecurityUtil.doPrivileged(new PrivilegedAction<ALCProcAddressTable>() {
                                 public ALCProcAddressTable run() {
                                     final ALCProcAddressTable alcProcAddressTable = new ALCProcAddressTable();
-                                    if(null==alcProcAddressTable) {
-                                      throw new RuntimeException("Couldn't instantiate ALCProcAddressTable");
-                                    }
                                     alcProcAddressTable.reset(ALImpl.alDynamicLookupHelper);
                                     /** Not required nor forced
                                     if( !initializeImpl() ) {
diff --git a/make/config/joal-alextabstract-CustomJavaCode.java b/make/config/joal-alextabstract-CustomJavaCode.java
index 19b42ab..7f18094 100644
--- a/make/config/joal-alextabstract-CustomJavaCode.java
+++ b/make/config/joal-alextabstract-CustomJavaCode.java
@@ -1,12 +1,9 @@
 private static final ALExtProcAddressTable alExtProcAddressTable;
 
 static {
-    alExtProcAddressTable = AccessController.doPrivileged(new PrivilegedAction<ALExtProcAddressTable>() {
+    alExtProcAddressTable = SecurityUtil.doPrivileged(new PrivilegedAction<ALExtProcAddressTable>() {
                                 public ALExtProcAddressTable run() {
                                     final ALExtProcAddressTable alExtProcAddressTable = new ALExtProcAddressTable();
-                                    if(null==alExtProcAddressTable) {
-                                      throw new RuntimeException("Couldn't instantiate ALExtProcAddressTable");
-                                    }
                                     alExtProcAddressTable.reset(ALImpl.alDynamicLookupHelper);
                                     /** Not required nor forced
                                     if( !initializeImpl() ) {
-- 
cgit v1.2.3