diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
index eaf68b4..2ad6f40 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
@@ -48,7 +48,7 @@
     private static RuntimeException _dbcpEx;
 
     protected JDBCConfiguration conf;
-    private DataSource _ds;
+    private volatile DataSource _ds;
 
     @Override
     public Connection getConnection(Properties props) throws SQLException {
diff --git a/pom.xml b/pom.xml
index 139b31f..2db65ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1741,7 +1741,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
-                <version>2.7.0</version>
+                <version>2.8.0</version>
             </dependency>
             <dependency>
                 <groupId>javax.xml.bind</groupId>