chores: make intention explicit on used threads

dorotaphanSiili · dorotaphanSiili · commit b8cf43d42dba · 2025-12-05T09:38:14.000+01:00
diff --git a/goldenmaster/counter/counter_impl/src/main/java/counter/counter_impl/CounterService.java b/goldenmaster/counter/counter_impl/src/main/java/counter/counter_impl/CounterService.java
@@ -23,7 +23,7 @@ public class CounterService extends AbstractCounter {
 
     private final static String TAG = "CounterService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private customTypes.customTypes_api.Vector3D m_vector = new customTypes.customTypes_api.Vector3D();
     private org.apache.commons.math3.geometry.euclidean.threed.Vector3D m_extern_vector = new org.apache.commons.math3.geometry.euclidean.threed.Vector3D(0.0, 0.0, 0.0);
     private customTypes.customTypes_api.Vector3D[] m_vectorArray = new customTypes.customTypes_api.Vector3D[]{};
diff --git a/goldenmaster/counter/counterjniservice/CounterJniService.java b/goldenmaster/counter/counterjniservice/CounterJniService.java
@@ -22,7 +22,7 @@ public class CounterJniService extends AbstractCounter {
 
     private final static String TAG = "CounterJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public CounterJniService()
     {
diff --git a/goldenmaster/tbEnum/tbEnum_impl/src/main/java/tbEnum/tbEnum_impl/EnumInterfaceService.java b/goldenmaster/tbEnum/tbEnum_impl/src/main/java/tbEnum/tbEnum_impl/EnumInterfaceService.java
@@ -27,7 +27,7 @@ public class EnumInterfaceService extends AbstractEnumInterface {
 
     private final static String TAG = "EnumInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Enum0 m_prop0 = Enum0.Value0;
     private Enum1 m_prop1 = Enum1.Value1;
     private Enum2 m_prop2 = Enum2.Value2;
diff --git a/goldenmaster/tbEnum/tbEnumjniservice/EnumInterfaceJniService.java b/goldenmaster/tbEnum/tbEnumjniservice/EnumInterfaceJniService.java
@@ -30,7 +30,7 @@ public class EnumInterfaceJniService extends AbstractEnumInterface {
 
     private final static String TAG = "EnumInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public EnumInterfaceJniService()
     {
diff --git a/goldenmaster/tbIfaceimport/tbIfaceimport_impl/src/main/java/tbIfaceimport/tbIfaceimport_impl/EmptyIfService.java b/goldenmaster/tbIfaceimport/tbIfaceimport_impl/src/main/java/tbIfaceimport/tbIfaceimport_impl/EmptyIfService.java
@@ -23,7 +23,7 @@ public class EmptyIfService extends AbstractEmptyIf {
 
     private final static String TAG = "EmptyIfService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public EmptyIfService()
     {
diff --git a/goldenmaster/tbIfaceimport/tbIfaceimportjniservice/EmptyIfJniService.java b/goldenmaster/tbIfaceimport/tbIfaceimportjniservice/EmptyIfJniService.java
@@ -22,7 +22,7 @@ public class EmptyIfJniService extends AbstractEmptyIf {
 
     private final static String TAG = "EmptyIfJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public EmptyIfJniService()
     {
diff --git a/goldenmaster/tbNames/tbNames_impl/src/main/java/tbNames/tbNames_impl/NamEsService.java b/goldenmaster/tbNames/tbNames_impl/src/main/java/tbNames/tbNames_impl/NamEsService.java
@@ -24,7 +24,7 @@ public class NamEsService extends AbstractNamEs {
 
     private final static String TAG = "NamEsService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private boolean m_Switch = false;
     private int m_SOME_PROPERTY = 0;
     private int m_Some_Poperty2 = 0;
diff --git a/goldenmaster/tbNames/tbNamesjniservice/NamEsJniService.java b/goldenmaster/tbNames/tbNamesjniservice/NamEsJniService.java
@@ -24,7 +24,7 @@ public class NamEsJniService extends AbstractNamEs {
 
     private final static String TAG = "NamEsJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public NamEsJniService()
     {
diff --git a/goldenmaster/tbRefIfaces/tbRefIfaces_impl/src/main/java/tbRefIfaces/tbRefIfaces_impl/ParentIfService.java b/goldenmaster/tbRefIfaces/tbRefIfaces_impl/src/main/java/tbRefIfaces/tbRefIfaces_impl/ParentIfService.java
@@ -25,7 +25,7 @@ public class ParentIfService extends AbstractParentIf {
 
     private final static String TAG = "ParentIfService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private ISimpleLocalIf m_localIf = null;
     private ISimpleLocalIf[] m_localIfList = new ISimpleLocalIf[]{};
     private tbIfaceimport.tbIfaceimport_api.IEmptyIf m_importedIf = null;
diff --git a/goldenmaster/tbRefIfaces/tbRefIfaces_impl/src/main/java/tbRefIfaces/tbRefIfaces_impl/SimpleLocalIfService.java b/goldenmaster/tbRefIfaces/tbRefIfaces_impl/src/main/java/tbRefIfaces/tbRefIfaces_impl/SimpleLocalIfService.java
@@ -23,7 +23,7 @@ public class SimpleLocalIfService extends AbstractSimpleLocalIf {
 
     private final static String TAG = "SimpleLocalIfService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private int m_intProperty = 0;
 
     public SimpleLocalIfService()
diff --git a/goldenmaster/tbRefIfaces/tbRefIfacesjniservice/ParentIfJniService.java b/goldenmaster/tbRefIfaces/tbRefIfacesjniservice/ParentIfJniService.java
@@ -24,7 +24,7 @@ public class ParentIfJniService extends AbstractParentIf {
 
     private final static String TAG = "ParentIfJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public ParentIfJniService()
     {
diff --git a/goldenmaster/tbRefIfaces/tbRefIfacesjniservice/SimpleLocalIfJniService.java b/goldenmaster/tbRefIfaces/tbRefIfacesjniservice/SimpleLocalIfJniService.java
@@ -22,7 +22,7 @@ public class SimpleLocalIfJniService extends AbstractSimpleLocalIf {
 
     private final static String TAG = "SimpleLocalIfJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SimpleLocalIfJniService()
     {
diff --git a/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameEnum1InterfaceService.java b/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameEnum1InterfaceService.java
@@ -24,7 +24,7 @@ public class SameEnum1InterfaceService extends AbstractSameEnum1Interface {
 
     private final static String TAG = "SameEnum1InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Enum1 m_prop1 = Enum1.Value1;
 
     public SameEnum1InterfaceService()
diff --git a/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameEnum2InterfaceService.java b/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameEnum2InterfaceService.java
@@ -25,7 +25,7 @@ public class SameEnum2InterfaceService extends AbstractSameEnum2Interface {
 
     private final static String TAG = "SameEnum2InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Enum1 m_prop1 = Enum1.Value1;
     private Enum2 m_prop2 = Enum2.Value1;
 
diff --git a/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameStruct1InterfaceService.java b/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameStruct1InterfaceService.java
@@ -24,7 +24,7 @@ public class SameStruct1InterfaceService extends AbstractSameStruct1Interface {
 
     private final static String TAG = "SameStruct1InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Struct1 m_prop1 = new Struct1();
 
     public SameStruct1InterfaceService()
diff --git a/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameStruct2InterfaceService.java b/goldenmaster/tbSame1/tbSame1_impl/src/main/java/tbSame1/tbSame1_impl/SameStruct2InterfaceService.java
@@ -25,7 +25,7 @@ public class SameStruct2InterfaceService extends AbstractSameStruct2Interface {
 
     private final static String TAG = "SameStruct2InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Struct2 m_prop1 = new Struct2();
     private Struct2 m_prop2 = new Struct2();
 
diff --git a/goldenmaster/tbSame1/tbSame1jniservice/SameEnum1InterfaceJniService.java b/goldenmaster/tbSame1/tbSame1jniservice/SameEnum1InterfaceJniService.java
@@ -24,7 +24,7 @@ public class SameEnum1InterfaceJniService extends AbstractSameEnum1Interface {
 
     private final static String TAG = "SameEnum1InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameEnum1InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame1/tbSame1jniservice/SameEnum2InterfaceJniService.java b/goldenmaster/tbSame1/tbSame1jniservice/SameEnum2InterfaceJniService.java
@@ -26,7 +26,7 @@ public class SameEnum2InterfaceJniService extends AbstractSameEnum2Interface {
 
     private final static String TAG = "SameEnum2InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameEnum2InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame1/tbSame1jniservice/SameStruct1InterfaceJniService.java b/goldenmaster/tbSame1/tbSame1jniservice/SameStruct1InterfaceJniService.java
@@ -24,7 +24,7 @@ public class SameStruct1InterfaceJniService extends AbstractSameStruct1Interface
 
     private final static String TAG = "SameStruct1InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameStruct1InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame1/tbSame1jniservice/SameStruct2InterfaceJniService.java b/goldenmaster/tbSame1/tbSame1jniservice/SameStruct2InterfaceJniService.java
@@ -26,7 +26,7 @@ public class SameStruct2InterfaceJniService extends AbstractSameStruct2Interface
 
     private final static String TAG = "SameStruct2InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameStruct2InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameEnum1InterfaceService.java b/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameEnum1InterfaceService.java
@@ -24,7 +24,7 @@ public class SameEnum1InterfaceService extends AbstractSameEnum1Interface {
 
     private final static String TAG = "SameEnum1InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Enum1 m_prop1 = Enum1.Value1;
 
     public SameEnum1InterfaceService()
diff --git a/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameEnum2InterfaceService.java b/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameEnum2InterfaceService.java
@@ -25,7 +25,7 @@ public class SameEnum2InterfaceService extends AbstractSameEnum2Interface {
 
     private final static String TAG = "SameEnum2InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Enum1 m_prop1 = Enum1.Value1;
     private Enum2 m_prop2 = Enum2.Value1;
 
diff --git a/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameStruct1InterfaceService.java b/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameStruct1InterfaceService.java
@@ -24,7 +24,7 @@ public class SameStruct1InterfaceService extends AbstractSameStruct1Interface {
 
     private final static String TAG = "SameStruct1InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Struct1 m_prop1 = new Struct1();
 
     public SameStruct1InterfaceService()
diff --git a/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameStruct2InterfaceService.java b/goldenmaster/tbSame2/tbSame2_impl/src/main/java/tbSame2/tbSame2_impl/SameStruct2InterfaceService.java
@@ -25,7 +25,7 @@ public class SameStruct2InterfaceService extends AbstractSameStruct2Interface {
 
     private final static String TAG = "SameStruct2InterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Struct2 m_prop1 = new Struct2();
     private Struct2 m_prop2 = new Struct2();
 
diff --git a/goldenmaster/tbSame2/tbSame2jniservice/SameEnum1InterfaceJniService.java b/goldenmaster/tbSame2/tbSame2jniservice/SameEnum1InterfaceJniService.java
@@ -24,7 +24,7 @@ public class SameEnum1InterfaceJniService extends AbstractSameEnum1Interface {
 
     private final static String TAG = "SameEnum1InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameEnum1InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame2/tbSame2jniservice/SameEnum2InterfaceJniService.java b/goldenmaster/tbSame2/tbSame2jniservice/SameEnum2InterfaceJniService.java
@@ -26,7 +26,7 @@ public class SameEnum2InterfaceJniService extends AbstractSameEnum2Interface {
 
     private final static String TAG = "SameEnum2InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameEnum2InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame2/tbSame2jniservice/SameStruct1InterfaceJniService.java b/goldenmaster/tbSame2/tbSame2jniservice/SameStruct1InterfaceJniService.java
@@ -24,7 +24,7 @@ public class SameStruct1InterfaceJniService extends AbstractSameStruct1Interface
 
     private final static String TAG = "SameStruct1InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameStruct1InterfaceJniService()
     {
diff --git a/goldenmaster/tbSame2/tbSame2jniservice/SameStruct2InterfaceJniService.java b/goldenmaster/tbSame2/tbSame2jniservice/SameStruct2InterfaceJniService.java
@@ -26,7 +26,7 @@ public class SameStruct2InterfaceJniService extends AbstractSameStruct2Interface
 
     private final static String TAG = "SameStruct2InterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SameStruct2InterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/EmptyInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/EmptyInterfaceService.java
@@ -23,7 +23,7 @@ public class EmptyInterfaceService extends AbstractEmptyInterface {
 
     private final static String TAG = "EmptyInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public EmptyInterfaceService()
     {
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/NoOperationsInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/NoOperationsInterfaceService.java
@@ -23,7 +23,7 @@ public class NoOperationsInterfaceService extends AbstractNoOperationsInterface
 
     private final static String TAG = "NoOperationsInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private boolean m_propBool = false;
     private int m_propInt = 0;
 
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/NoPropertiesInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/NoPropertiesInterfaceService.java
@@ -23,7 +23,7 @@ public class NoPropertiesInterfaceService extends AbstractNoPropertiesInterface
 
     private final static String TAG = "NoPropertiesInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public NoPropertiesInterfaceService()
     {
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/NoSignalsInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/NoSignalsInterfaceService.java
@@ -23,7 +23,7 @@ public class NoSignalsInterfaceService extends AbstractNoSignalsInterface {
 
     private final static String TAG = "NoSignalsInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private boolean m_propBool = false;
     private int m_propInt = 0;
 
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/SimpleArrayInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/SimpleArrayInterfaceService.java
@@ -23,7 +23,7 @@ public class SimpleArrayInterfaceService extends AbstractSimpleArrayInterface {
 
     private final static String TAG = "SimpleArrayInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private boolean[] m_propBool = new boolean[]{};
     private int[] m_propInt = new int[]{};
     private int[] m_propInt32 = new int[]{};
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/SimpleInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/SimpleInterfaceService.java
@@ -23,7 +23,7 @@ public class SimpleInterfaceService extends AbstractSimpleInterface {
 
     private final static String TAG = "SimpleInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
     private boolean m_propBool = false;
     private int m_propInt = 0;
     private int m_propInt32 = 0;
diff --git a/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/VoidInterfaceService.java b/goldenmaster/tbSimple/tbSimple_impl/src/main/java/tbSimple/tbSimple_impl/VoidInterfaceService.java
@@ -23,7 +23,7 @@ public class VoidInterfaceService extends AbstractVoidInterface {
 
     private final static String TAG = "VoidInterfaceService";
     private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public VoidInterfaceService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/EmptyInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/EmptyInterfaceJniService.java
@@ -22,7 +22,7 @@ public class EmptyInterfaceJniService extends AbstractEmptyInterface {
 
     private final static String TAG = "EmptyInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public EmptyInterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/NoOperationsInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/NoOperationsInterfaceJniService.java
@@ -22,7 +22,7 @@ public class NoOperationsInterfaceJniService extends AbstractNoOperationsInterfa
 
     private final static String TAG = "NoOperationsInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public NoOperationsInterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/NoPropertiesInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/NoPropertiesInterfaceJniService.java
@@ -22,7 +22,7 @@ public class NoPropertiesInterfaceJniService extends AbstractNoPropertiesInterfa
 
     private final static String TAG = "NoPropertiesInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public NoPropertiesInterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/NoSignalsInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/NoSignalsInterfaceJniService.java
@@ -22,7 +22,7 @@ public class NoSignalsInterfaceJniService extends AbstractNoSignalsInterface {
 
     private final static String TAG = "NoSignalsInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public NoSignalsInterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/SimpleArrayInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/SimpleArrayInterfaceJniService.java
@@ -22,7 +22,7 @@ public class SimpleArrayInterfaceJniService extends AbstractSimpleArrayInterface
 
     private final static String TAG = "SimpleArrayInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SimpleArrayInterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/SimpleInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/SimpleInterfaceJniService.java
@@ -22,7 +22,7 @@ public class SimpleInterfaceJniService extends AbstractSimpleInterface {
 
     private final static String TAG = "SimpleInterfaceJniService";
     private static boolean isServiceReady = false;
-    private static final ExecutorService executor = Executors.newFixedThreadPool(1);
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public SimpleInterfaceJniService()
     {
diff --git a/goldenmaster/tbSimple/tbSimplejniservice/VoidInterfaceJniService.java b/goldenmaster/tbSimple/tbSimplejniservice/VoidInterfaceJniService.java
diff --git a/goldenmaster/testbed1/testbed1_impl/src/main/java/testbed1/testbed1_impl/StructArray2InterfaceService.java b/goldenmaster/testbed1/testbed1_impl/src/main/java/testbed1/testbed1_impl/StructArray2InterfaceService.java
diff --git a/goldenmaster/testbed1/testbed1_impl/src/main/java/testbed1/testbed1_impl/StructArrayInterfaceService.java b/goldenmaster/testbed1/testbed1_impl/src/main/java/testbed1/testbed1_impl/StructArrayInterfaceService.java
diff --git a/goldenmaster/testbed1/testbed1_impl/src/main/java/testbed1/testbed1_impl/StructInterfaceService.java b/goldenmaster/testbed1/testbed1_impl/src/main/java/testbed1/testbed1_impl/StructInterfaceService.java
diff --git a/goldenmaster/testbed1/testbed1jniservice/StructArray2InterfaceJniService.java b/goldenmaster/testbed1/testbed1jniservice/StructArray2InterfaceJniService.java
diff --git a/goldenmaster/testbed1/testbed1jniservice/StructArrayInterfaceJniService.java b/goldenmaster/testbed1/testbed1jniservice/StructArrayInterfaceJniService.java
diff --git a/goldenmaster/testbed1/testbed1jniservice/StructInterfaceJniService.java b/goldenmaster/testbed1/testbed1jniservice/StructInterfaceJniService.java
diff --git a/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/ManyParamInterfaceService.java b/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/ManyParamInterfaceService.java
diff --git a/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/NestedStruct1InterfaceService.java b/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/NestedStruct1InterfaceService.java
diff --git a/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/NestedStruct2InterfaceService.java b/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/NestedStruct2InterfaceService.java
diff --git a/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/NestedStruct3InterfaceService.java b/goldenmaster/testbed2/testbed2_impl/src/main/java/testbed2/testbed2_impl/NestedStruct3InterfaceService.java
diff --git a/goldenmaster/testbed2/testbed2jniservice/ManyParamInterfaceJniService.java b/goldenmaster/testbed2/testbed2jniservice/ManyParamInterfaceJniService.java
diff --git a/goldenmaster/testbed2/testbed2jniservice/NestedStruct1InterfaceJniService.java b/goldenmaster/testbed2/testbed2jniservice/NestedStruct1InterfaceJniService.java
diff --git a/goldenmaster/testbed2/testbed2jniservice/NestedStruct2InterfaceJniService.java b/goldenmaster/testbed2/testbed2jniservice/NestedStruct2InterfaceJniService.java
diff --git a/goldenmaster/testbed2/testbed2jniservice/NestedStruct3InterfaceJniService.java b/goldenmaster/testbed2/testbed2jniservice/NestedStruct3InterfaceJniService.java
diff --git a/templates/jnibridge/service/jnibridgeservice.java.tpl b/templates/jnibridge/service/jnibridgeservice.java.tpl
diff --git a/templates/stub/implservice.java.tpl b/templates/stub/implservice.java.tpl

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class CounterJniService extends AbstractCounter {`
`22`	`22`
`23`	`23`	`private final static String TAG = "CounterJniService";`
`24`	`24`	`private static boolean isServiceReady = false;`
`25`		`- private static final ExecutorService executor = Executors.newFixedThreadPool(1);`
	`25`	`+ private static final ExecutorService executor = Executors.newSingleThreadExecutor();`
`26`	`26`
`27`	`27`	`public CounterJniService()`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class EnumInterfaceJniService extends AbstractEnumInterface {`
`30`	`30`
`31`	`31`	`private final static String TAG = "EnumInterfaceJniService";`
`32`	`32`	`private static boolean isServiceReady = false;`
`33`		`- private static final ExecutorService executor = Executors.newFixedThreadPool(1);`
	`33`	`+ private static final ExecutorService executor = Executors.newSingleThreadExecutor();`
`34`	`34`
`35`	`35`	`public EnumInterfaceJniService()`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class EmptyIfService extends AbstractEmptyIf {`
`23`	`23`
`24`	`24`	`private final static String TAG = "EmptyIfService";`
`25`	`25`	`private static boolean isServiceReady = true;//Use if you're waiting for some setup to be done`
`26`		`- private static final ExecutorService executor = Executors.newFixedThreadPool(1);`
	`26`	`+ private static final ExecutorService executor = Executors.newSingleThreadExecutor();`
`27`	`27`
`28`	`28`	`public EmptyIfService()`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class EmptyIfJniService extends AbstractEmptyIf {`
`22`	`22`
`23`	`23`	`private final static String TAG = "EmptyIfJniService";`
`24`	`24`	`private static boolean isServiceReady = false;`
`25`		`- private static final ExecutorService executor = Executors.newFixedThreadPool(1);`
	`25`	`+ private static final ExecutorService executor = Executors.newSingleThreadExecutor();`
`26`	`26`
`27`	`27`	`public EmptyIfJniService()`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class NamEsJniService extends AbstractNamEs {`
`24`	`24`
`25`	`25`	`private final static String TAG = "NamEsJniService";`
`26`	`26`	`private static boolean isServiceReady = false;`
`27`		`- private static final ExecutorService executor = Executors.newFixedThreadPool(1);`
	`27`	`+ private static final ExecutorService executor = Executors.newSingleThreadExecutor();`
`28`	`28`
`29`	`29`	`public NamEsJniService()`
`30`	`30`	`{`