fix a couple files from latest pull from develop
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d1f4a0bb Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d1f4a0bb Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d1f4a0bb Branch: refs/heads/feature/GEODE-2420 Commit: d1f4a0bbeef6687b8f5bd2fb3b59a21d4d946a9c Parents: 4f69cf9 Author: Ken Howe <[email protected]> Authored: Tue Mar 28 08:59:15 2017 -0700 Committer: Ken Howe <[email protected]> Committed: Tue Mar 28 08:59:15 2017 -0700 ---------------------------------------------------------------------- .../org/apache/geode/distributed/DistributedSystemDUnitTest.java | 2 ++ .../java/org/apache/geode/cache/lucene/LuceneResultStruct.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/d1f4a0bb/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java index dfe4588..9a64f53 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java @@ -124,6 +124,8 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase { } }); + // TODO: assert that queue was created or this test is just broken + assertThat(distributionManager.getMembershipManager().waitForDeparture(member)) .as("expected the serial queue to be flushed").isTrue(); } http://git-wip-us.apache.org/repos/asf/geode/blob/d1f4a0bb/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java index 5d2184e..4a6481f 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java @@ -14,8 +14,6 @@ */ package org.apache.geode.cache.lucene; -import java.io.Serializable; - import org.apache.geode.annotations.Experimental; /** @@ -23,7 +21,7 @@ import org.apache.geode.annotations.Experimental; * */ @Experimental -public interface LuceneResultStruct<K, V> extends Serializable { +public interface LuceneResultStruct<K, V> { /** * @return The region key of the entry matching the query
