You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2014/03/23 22:03:31 UTC
svn commit: r1580612 - in /zookeeper/trunk: CHANGES.txt
src/java/test/org/apache/zookeeper/test/AsyncOps.java
Author: michim
Date: Sun Mar 23 21:03:31 2014
New Revision: 1580612
URL: http://svn.apache.org/r1580612
Log:
ZOOKEEPER-1901. [JDK8] Sort children for comparison in AsyncOps tests (Andrew Purtell via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOps.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1580612&r1=1580611&r2=1580612&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Mar 23 21:03:31 2014
@@ -579,6 +579,9 @@ BUGFIXES:
ZOOKEEPER-1862. ServerCnxnTest.testServerCnxnExpiry is intermittently failing
(Rakesh R via michim)
+ ZOOKEEPER-1901. [JDK8] Sort children for comparison in AsyncOps tests
+ (Andrew Purtell via michim)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOps.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOps.java?rev=1580612&r1=1580611&r2=1580612&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOps.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOps.java Sun Mar 23 21:03:31 2014
@@ -19,6 +19,7 @@
package org.apache.zookeeper.test;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -236,6 +237,7 @@ public class AsyncOps {
{
this.children =
(children == null ? new ArrayList<String>() : children);
+ Collections.sort(this.children);
super.processResult(Code.get(rc), path, ctx);
}
@@ -321,6 +323,7 @@ public class AsyncOps {
{
this.children =
(children == null ? new ArrayList<String>() : children);
+ Collections.sort(this.children);
super.processResult(Code.get(rc), path, ctx);
}