From a3a01eb1490ae713e2dfe9516f91776595f755e3 Mon Sep 17 00:00:00 2001 From: wangcheng Date: Fri, 18 Mar 2016 21:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DorderType=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/druid/stat/DruidStatService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index 4e1268390a..894a9d0cbc 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -59,7 +59,9 @@ public final class DruidStatService implements DruidStatServiceMBean { private final static int DEFAULT_PAGE = 1; private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; - private static final String DEFAULT_ORDER_TYPE = "asc"; + private static final String ORDER_TYPE_DESC = "desc"; + private static final String ORDER_TYPE_ASC = "asc"; + private static final String DEFAULT_ORDER_TYPE = ORDER_TYPE_ASC; private static final String DEFAULT_ORDERBY = "SQL"; private DruidStatService(){ @@ -220,7 +222,7 @@ public final class DruidStatService implements DruidStatServiceMBean { Integer page = DEFAULT_PAGE; Integer perPageCount = DEFAULT_PER_PAGE_COUNT; if (parameters == null) { - orderBy = DEFAULT_ORDER_TYPE; + orderBy = DEFAULT_ORDERBY; orderType = DEFAULT_ORDER_TYPE; page = DEFAULT_PAGE; perPageCount = DEFAULT_PER_PAGE_COUNT; @@ -241,13 +243,13 @@ public final class DruidStatService implements DruidStatServiceMBean { orderBy = orderBy == null ? DEFAULT_ORDERBY : orderBy; orderType = orderType == null ? DEFAULT_ORDER_TYPE : orderType; - if (!"desc".equals(orderType)) { - orderType = DEFAULT_ORDER_TYPE; + if (! ORDER_TYPE_DESC.equals(orderType)) { + orderType = ORDER_TYPE_ASC; } // orderby the statData array - if (orderBy != null && orderBy.trim().length() != 0) { - Collections.sort(array, new MapComparator(orderBy, DEFAULT_ORDER_TYPE.equals(orderType))); + if (orderBy.trim().length() != 0) { + Collections.sort(array, new MapComparator(orderBy, ORDER_TYPE_DESC.equals(orderType))); } // page