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/24 22:45:38 UTC
svn commit: r1581080 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/test/org/apache/zookeeper/test/AsyncOps.java
Author: michim
Date: Mon Mar 24 21:45:38 2014
New Revision: 1581080
URL: http://svn.apache.org/r1581080
Log:
ZOOKEEPER-1901. [JDK8] Sort children for comparison in AsyncOps tests (Andrew Purtell via michim)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/AsyncOps.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1581080&r1=1581079&r2=1581080&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Mar 24 21:45:38 2014
@@ -8,6 +8,9 @@ BUGFIXES:
ZOOKEEPER-1878. Inconsistent behavior in autocreation of dataDir and
dataLogDir (Rakesh R via michim)
+ ZOOKEEPER-1901. [JDK8] Sort children for comparison in AsyncOps tests
+ (Andrew Purtell via michim)
+
Release 3.4.6 - 2014-03-10
Modified: zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/AsyncOps.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/AsyncOps.java?rev=1581080&r1=1581079&r2=1581080&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/AsyncOps.java (original)
+++ zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/AsyncOps.java Mon Mar 24 21:45:38 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;
@@ -235,6 +236,7 @@ public class AsyncOps {
{
this.children =
(children == null ? new ArrayList<String>() : children);
+ Collections.sort(this.children);
super.processResult(Code.get(rc), path, ctx);
}
@@ -320,6 +322,7 @@ public class AsyncOps {
{
this.children =
(children == null ? new ArrayList<String>() : children);
+ Collections.sort(this.children);
super.processResult(Code.get(rc), path, ctx);
}