syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gwim...@apache.org
Subject [2/2] syncope git commit: Merge branch '1_2_X'
Date Tue, 10 Feb 2015 10:04:38 GMT
Merge branch '1_2_X'


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e777d5ba
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e777d5ba
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e777d5ba

Branch: refs/heads/master
Commit: e777d5babde5912dc991cd1888da7636c81a2ad2
Parents: aba10ec 1ef6896
Author: Guido Wimmel <gwimmel@apache.org>
Authored: Tue Feb 10 10:57:38 2015 +0100
Committer: Guido Wimmel <gwimmel@apache.org>
Committed: Tue Feb 10 10:57:38 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/syncope/core/util/ContentLoaderHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/e777d5ba/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
index ccf2e86,3b5a409..263ea24
--- a/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
@@@ -54,19 -54,19 +54,19 @@@ public class ContentLoaderHandler exten
      private Object[] getParameters(final String tableName, final Attributes attrs) {
          JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
  
-         Map<String, Integer> colTypes = jdbcTemplate.query("SELECT * FROM " + tableName,
+         Map<String, Integer> colTypes = jdbcTemplate.query("SELECT * FROM " + tableName
+ " WHERE 0=1",
                  new ResultSetExtractor<Map<String, Integer>>() {
  
 -            @Override
 -            public Map<String, Integer> extractData(final ResultSet rs) throws SQLException,
DataAccessException {
 -                Map<String, Integer> colTypes = new HashMap<String, Integer>();
 -                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
 -                    colTypes.put(rs.getMetaData().getColumnName(i).toUpperCase(),
 -                            rs.getMetaData().getColumnType(i));
 -                }
 -                return colTypes;
 -            }
 -        });
 +                    @Override
 +                    public Map<String, Integer> extractData(final ResultSet rs) throws
SQLException, DataAccessException {
 +                        Map<String, Integer> colTypes = new HashMap<String, Integer>();
 +                        for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++)
{
 +                            colTypes.put(rs.getMetaData().getColumnName(i).toUpperCase(),
 +                                    rs.getMetaData().getColumnType(i));
 +                        }
 +                        return colTypes;
 +                    }
 +                });
  
          Object[] parameters = new Object[attrs.getLength()];
          for (int i = 0; i < attrs.getLength(); i++) {


Mime
View raw message