Preventing c3p0 data source from occasionally initializing twice.

inca · May 23, 2013 · 7ee48e3 · 7ee48e3
1 parent 8940321
commit 7ee48e3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/orm/src/main/scala/config.scala b/orm/src/main/scala/config.scala
@@ -171,11 +171,15 @@ class SimpleConnectionProvider(val driverClass: String,
         ds
     }
 
+  @volatile
   protected var _ds: DataSource = null
 
   def dataSource: DataSource = {
     if (_ds == null)
-      _ds = createDataSource
+      this.synchronized {
+        if (_ds == null)
+          _ds = createDataSource
+      }
     _ds
   }