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=bd197313c85d3ee6336e7e7cbf7ff706247df9b4;hp=63ca374785ea8cfd89d67f69853b72a4f8bb8d7b;hpb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;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 63ca3747..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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2010 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package org.wamblee.support.persistence;
 
 import java.util.ArrayList;
@@ -45,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.
     }
@@ -82,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();
@@ -103,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());
@@ -111,10 +128,4 @@ public class DatabaseBuilder {
         return descriptions;
     }
 
-    private static void initLoader() {
-        if (LOADER == null) {
-            LOADER = ServiceLoader.load(DatabaseProvider.class);
-        }
-    }
-
 }