Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07B25DF3D for ; Thu, 28 Jun 2012 23:42:20 +0000 (UTC) Received: (qmail 11334 invoked by uid 500); 28 Jun 2012 23:42:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 11291 invoked by uid 500); 28 Jun 2012 23:42:19 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 11283 invoked by uid 99); 28 Jun 2012 23:42:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jun 2012 23:42:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jun 2012 23:42:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6371C2388962; Thu, 28 Jun 2012 23:41:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 28 Jun 2012 23:41:55 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120628234156.6371C2388962@eris.apache.org> 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); }