svn commit: r1355196 - in /cxf/branches/2.6.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

[ay]

Author: ay
Date: Thu Jun 28 23:41:55 2012
New Revision: 1355196

URL: http://svn.apache.org/viewvc?rev=1355196&view=rev
Log:
Merged revisions 1355195 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1355195 | ay | 2012-06-29 01:37:04 +0200 (Fri, 29 Jun 2012) | 1 line
  
  fix test errors under jdk15 for CXF-4362
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=1355196&r1=1355195&r2=1355196&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
 Thu Jun 28 23:41:55 2012
@@ -1105,7 +1105,10 @@ public class RMTxStore implements RMStor
                 if (LOG.isLoggable(Level.FINE)) {
                     LOG.log(Level.FINE, "Using url: " + url);
                 }
+                Class.forName(driverClassName);
                 con = DriverManager.getConnection(url, userName, password);
+            } catch (ClassNotFoundException ex) {
+                LogUtils.log(LOG, Level.SEVERE, "CONNECT_EXC", ex);
             } catch (SQLException ex) {
                 LogUtils.log(LOG, Level.SEVERE, "CONNECT_EXC", ex);
             }