svn commit: r1709318 - in /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

[fschumacher]

Author: fschumacher
Date: Sun Oct 18 20:56:21 2015
New Revision: 1709318

URL: http://svn.apache.org/viewvc?rev=1709318&view=rev
Log:
Followup to r1708780. As kkolinko noted, tomcat 7 needs to be built with java 6.

Modified:
    
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
    
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1709318&r1=1709317&r2=1709318&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 Sun Oct 18 20:56:21 2015
@@ -447,7 +447,7 @@ public class SlowQueryReport extends Abs
 
         @Override
         public int compare(QueryStats stats1, QueryStats stats2) {
-            return Long.compare(stats1.lastInvocation, stats2.lastInvocation);
+            return 
Long.valueOf(stats1.lastInvocation).compareTo(stats2.lastInvocation);
         }
     }
 

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1709318&r1=1709317&r2=1709318&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 Sun Oct 18 20:56:21 2015
@@ -45,7 +45,7 @@ public class TestSlowQueryComparator {
 
         };
 
-        List<QueryStats> stats = new ArrayList<>();
+        List<QueryStats> stats = new ArrayList<QueryStats>();
 
         for (int i = 0; i < testData.length; i++) {
             QueryStats qs = new QueryStats(String.valueOf(i));



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org