X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fenterprise%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2FDatabaseBuilder.java;h=ae7cd28aa78259d08f395056e20b2ae830b07613;hb=dec278a67997ea8e85d10662e31548afd8890ed3;hp=f086c6d1abaacc5d9a1bddc32ccff27b3f77cb3f;hpb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;p=utils

diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java
index f086c6d1..ae7cd28a 100644
--- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java
+++ b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java
@@ -60,10 +60,14 @@ public class DatabaseBuilder {
      * Environmment variable by which capabilities of the requested database can
      * be defined
      */
-    private static final String DB_CAPABILITIES_PROP = "TEST_DB_CAPABILITIES";
+    public static final String DB_CAPABILITIES_PROP = "TEST_DB_CAPABILITIES";
 
-    private static ServiceLoader<DatabaseProvider> LOADER = null;
+    private static ServiceLoader<DatabaseProvider> LOADER = 
+        ServiceLoader.load(DatabaseProvider.class);
 
+    /**
+     * Constructs the database builder. 
+     */
     private DatabaseBuilder() {
         // Empty.
     }
@@ -97,10 +101,9 @@ public class DatabaseBuilder {
                     aCapabilities = new String[] { DatabaseProvider.CAPABILITY_IN_MEMORY };
                 }
             }
-            LOGGER.info("Using capabilities: " + aCapabilities);
+            LOGGER.info("Using capabilities: " + Arrays.asList(aCapabilities));
         }
         synchronized (DatabaseBuilder.class) {
-            initLoader();
             for (DatabaseProvider db : LOADER) {
                 if (db.supportsCapabilities(aCapabilities)) {
                     return db.create();
@@ -118,7 +121,6 @@ public class DatabaseBuilder {
      * @return List of databases.
      */
     public static List<DatabaseDescription> getSupportedDatabases() {
-        initLoader();
         List<DatabaseDescription> descriptions = new ArrayList<DatabaseDescription>();
         for (DatabaseProvider db : LOADER) {
             descriptions.add(db.getDescription());
@@ -126,10 +128,4 @@ public class DatabaseBuilder {
         return descriptions;
     }
 
-    private static void initLoader() {
-        if (LOADER == null) {
-            LOADER = ServiceLoader.load(DatabaseProvider.class);
-        }
-    }
-
 }