[Wikitty-commits] r313 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc

15 Sep 2010

Author: echatellier
Date: 2010-09-15 14:22:45 +0200 (Wed, 15 Sep 2010)
New Revision: 313

Url: http://nuiton.org/repositories/revision/wikitty/313

Log:
Fix properties names starting with xa resources class name key

Modified:
   trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java

Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java
===================================================================

--- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java	2010-09-15 11:32:41 UTC (rev 312)
+++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java	2010-09-15 12:22:45 UTC (rev 313)
@@ -21,7 +21,6 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -255,17 +254,16 @@
 
                     // Inject properties in xadatasource
                     for(Entry<Object, Object> properties : conf.entrySet()) {
-                        String propertyName = ((String) properties.getKey())
-                                .replaceFirst(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".", "");
-
-                        if(!propertyName.equals(JDBC_XADATASOURCE)) {
+                        String propertyName = (String) properties.getKey();
+                        if (propertyName.startsWith(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".")) {
+                            propertyName = propertyName.replaceFirst(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".", "");
                             if(fields.contains(propertyName)) {
                                 String propertyValue = (String) properties.getValue();
                                 BeanUtils.setProperty(xaDataSource, propertyName, propertyValue);
                             } else {
                                 log.warn("Invalid property " + propertyName + " for XADatasource " + Arrays.toString(fields.toArray()));
                             }
-                        }
+                        }                        
                     }
                     dataSource.setXaDataSourceInstance(xaDataSource);
                 } else {

    

[Wikitty-commits] r313 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc

echatellier＠users.nuiton.org