Merge remote-tracking branch 'zhb/master'

Conflicts:
	src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
This commit is contained in:
zhouhaibin
2012-08-10 12:50:42 +08:00
parent 339e5f944f
commit e008c0b27b
@@ -144,6 +144,7 @@ public class StatViewServlet extends HttpServlet {
List<SQLStatement> statementList = SQLUtils.parseStatements((String) sqlStat.get("SQL"),
(String) sqlStat.get("DbType"));
if (!statementList.isEmpty()) {
content.append("<h2>Parse View:</h2>");