Long.compare 需要jdk 1.7 改下兼容1。6

nalan1976 · Nov 21, 2013 · 98d6162 · 98d6162
1 parent 4f35b2c
commit 98d6162
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/monitor/ehcache/index.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/monitor/ehcache/index.jsp
@@ -92,7 +92,7 @@
                         double n2HitPercent = 1.0 * s2.getCacheHits() / Math.max(s2.getCacheHits() + s2.getCacheMisses(), 1);
                         return -Double.compare(n1HitPercent, n2HitPercent);
                     } else if("objectCount".equals(sort)) {
-                        return -Long.compare(s1.getObjectCount(), s2.getObjectCount());
+                        return -Long.valueOf(s1.getObjectCount()).compareTo(Long.valueOf(s2.getObjectCount()));
                     }
                     return -n1.compareTo(n2);
                 }

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/monitor/hibernate/queryCache.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/monitor/hibernate/queryCache.jsp
@@ -198,33 +198,35 @@
                     return -Double.compare(s1HitPercent, s2HitPercent);
                 }
                 if ("hitCount".equals(sortBy)) {
-                    return -Long.compare(s1.getCacheHitCount(), s2.getCacheHitCount());
+                    return -Long.valueOf(s1.getCacheHitCount()).compareTo(Long.valueOf(s2.getCacheHitCount()));
                 }
                 if ("missCount".equals(sortBy)) {
-                    return -Long.compare(s1.getCacheMissCount(), s2.getCacheMissCount());
+                    return -Long.valueOf(s1.getCacheMissCount()).compareTo(Long.valueOf(s2.getCacheMissCount()));
                 }
                 if ("putCount".equals(sortBy)) {
-                    return -Long.compare(s1.getCachePutCount(), s2.getCachePutCount());
+                    return -Long.valueOf(s1.getCachePutCount()).compareTo(Long.valueOf(s2.getCachePutCount()));
                 }
                 if ("executionCount".equals(sortBy)) {
-                    return -Long.compare(s1.getExecutionCount(), s2.getExecutionCount());
+                    return -Long.valueOf(s1.getExecutionCount()).compareTo(Long.valueOf(s2.getExecutionCount()));
                 }
                 if ("executionRowCount".equals(sortBy)) {
-                    return -Long.compare(s1.getExecutionRowCount(), s2.getExecutionRowCount());
+                    return -Long.valueOf(s1.getExecutionRowCount()).compareTo(Long.valueOf(s2.getExecutionRowCount()));
                 }
                 if ("executionAvgRowCount".equals(sortBy)) {
-                    return -Long.compare(
-                            s1.getExecutionRowCount() / s1.getExecutionRowCount(),
-                            s2.getExecutionRowCount() / s1.getExecutionRowCount());
+                    return -Long.valueOf(s1.getExecutionRowCount() / s1.getExecutionRowCount())
+                            .compareTo(Long.valueOf(s2.getExecutionRowCount() / s1.getExecutionRowCount()));
                 }
                 if ("executionAvgTime".equals(sortBy)) {
-                    return -Long.compare(s1.getExecutionAvgTime(), s2.getExecutionAvgTime());
+                    return -Long.valueOf(s1.getExecutionAvgTime())
+                            .compareTo(Long.valueOf(s2.getExecutionAvgTime()));
                 }
                 if ("executionMaxTime".equals(sortBy)) {
-                    return -Long.compare(s1.getExecutionMaxTime(), s2.getExecutionMaxTime());
+                    return -Long.valueOf(s1.getExecutionMaxTime())
+                            .compareTo(Long.valueOf(s2.getExecutionMaxTime()));
                 }
                 if ("executionMinTime".equals(sortBy)) {
-                    return -Long.compare(s1.getExecutionMinTime(), s2.getExecutionMinTime());
+                    return -Long.valueOf(s1.getExecutionMinTime())
+                            .compareTo(Long.valueOf(s2.getExecutionMinTime()));
                 }
 
                 return -q1.compareTo(q2);