CSPACE-5359: Removing private static class member for storing/cacheing getCommonServi...

diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
index 8b3577c80b8455fce2376ca6fae28a44e94f405b..9f1bbc29e64f44c21f3e27ef40671d2c869ac0f6 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
@@ -194,18 +194,16 @@ public class ServiceBindingUtils {
        }\r
     } \r
     \r
-    private static ArrayList<String> commonServiceTypes = null;\r
     private static ArrayList<String> commonProcedureServiceTypes = null;\r
    \r
     public static ArrayList<String> getCommonServiceTypes(boolean includeAuthorities) {\r
-       if(commonServiceTypes == null) {\r
-               commonServiceTypes = new ArrayList<String>();\r
-               if (includeAuthorities == true) {\r
-                       commonServiceTypes.add(SERVICE_TYPE_AUTHORITY); // REM - CSPACE-5359: Added back authorities to resolve this issue.\r
-               }\r
-               commonServiceTypes.add(SERVICE_TYPE_OBJECT);\r
-               commonServiceTypes.add(SERVICE_TYPE_PROCEDURE);\r
-       }\r
+        ArrayList<String> commonServiceTypes = new ArrayList<String>();\r
+               if (includeAuthorities == true) {\r
+                       commonServiceTypes.add(SERVICE_TYPE_AUTHORITY); // REM - CSPACE-5359: Added back authorities on demand to resolve this issue.\r
+               }\r
+               commonServiceTypes.add(SERVICE_TYPE_OBJECT);\r
+               commonServiceTypes.add(SERVICE_TYPE_PROCEDURE);\r
+               \r
        return commonServiceTypes;\r
     }\r
     \r
@@ -217,6 +215,7 @@ public class ServiceBindingUtils {
     // FIXME; this method is intended to be temporary.  It was added in part to\r
     // make the effect of the workaround more explicit, and in part to avoid\r
     // breaking the use of the getCommonServiceTypes method in ServiceGroups.\r
+    @Deprecated\r
     public static ArrayList<String> getCommonProcedureServiceTypes() {\r
         if(commonProcedureServiceTypes == null) {\r
             commonProcedureServiceTypes = new ArrayList<String>();\r