Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wenshao
2013-06-30 16:52:24 +08:00
3 changed files with 71 additions and 18 deletions
@@ -78,5 +78,5 @@ public class JdbcUtilsTest extends TestCase {
List<Map<String, Object>> list = JdbcUtils.executeQuery(dataSource, "select * from user");
Assert.assertEquals(0, list.size());
}
}
}
}