You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/04/25 16:05:33 UTC
geode git commit: Fixup
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-6-1 d79314297 -> 474dbe04f
Fixup
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/474dbe04
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/474dbe04
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/474dbe04
Branch: refs/heads/feature/GEODE-2632-6-1
Commit: 474dbe04f05f7a4ffef7b3ed894fe8619e90e0ef
Parents: d793142
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Apr 25 09:05:22 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Apr 25 09:05:22 2017 -0700
----------------------------------------------------------------------
.../org/apache/geode/internal/cache/GemFireCacheImpl.java | 7 +++----
.../index/NewDeclarativeIndexCreationJUnitTest.java | 9 +++++----
.../apache/geode/cache/query/internal/cq/CqServiceImpl.java | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/474dbe04/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index d18b683..0bb31db 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -1393,10 +1393,9 @@ public class GemFireCacheImpl
new CacheXmlException(LocalizedStrings.GemFireCache_WHILE_READING_CACHE_XML_0_1
.toLocalizedString(url, ex.getMessage()));
/*
- * TODO: why use setStackTrace and initCause? removal breaks several tests:
- * OplogRVVJUnitTest, NewDeclarativeIndexCreationJUnitTest
- * CacheXml70DUnitTest, CacheXml80DUnitTest, CacheXml81DUnitTest, CacheXmlGeode10DUnitTest
- * RegionManagementDUnitTest
+ * TODO: why use setStackTrace and initCause? removal breaks several tests: OplogRVVJUnitTest,
+ * NewDeclarativeIndexCreationJUnitTest CacheXml70DUnitTest, CacheXml80DUnitTest,
+ * CacheXml81DUnitTest, CacheXmlGeode10DUnitTest RegionManagementDUnitTest
*/
newEx.setStackTrace(ex.getStackTrace());
newEx.initCause(ex.getCause());
http://git-wip-us.apache.org/repos/asf/geode/blob/474dbe04/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 780a7a8..e7f5c08 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -145,7 +145,8 @@ public class NewDeclarativeIndexCreationJUnitTest {
}
this.cacheXmlFile = this.temporaryFolder.newFile("cachequeryindexwitherror.xml");
- FileUtils.copyURLToFile(getClass().getResource("cachequeryindexwitherror.xml"), this.cacheXmlFile);
+ FileUtils.copyURLToFile(getClass().getResource("cachequeryindexwitherror.xml"),
+ this.cacheXmlFile);
assertThat(this.cacheXmlFile).exists(); // precondition
Properties props = new Properties();
@@ -155,10 +156,10 @@ public class NewDeclarativeIndexCreationJUnitTest {
DistributedSystem ds = DistributedSystem.connect(props);
// TODO: refactoring GemFireCacheImpl.initializeDeclarativeCache requires change here
- assertThatThrownBy(() -> CacheFactory.create(ds))
- .isExactlyInstanceOf(CacheXmlException.class)
+ assertThatThrownBy(() -> CacheFactory.create(ds)).isExactlyInstanceOf(CacheXmlException.class)
.hasCauseInstanceOf(InternalGemFireException.class);
- // hasCauseMessageContaining("CacheXmlParser::endIndex:Index creation attribute not correctly specified.");
+ // hasCauseMessageContaining("CacheXmlParser::endIndex:Index creation attribute not correctly
+ // specified.");
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/474dbe04/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index 570c06c..54cadcb 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -776,7 +776,7 @@ public final class CqServiceImpl implements CqService {
if (clientProxyId == null) {
throw new CqException(
LocalizedStrings.CqService_UNABLE_TO_RETRIEVE_DURABLE_CQS_FOR_CLIENT_PROXY_ID
- .toLocalizedString(null));
+ .toLocalizedString());
}
List<ServerCQ> cqs = getAllClientCqs(clientProxyId);
ArrayList<String> durableClientCqs = new ArrayList<>();