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/05/03 23:36:55 UTC
[1/2] geode git commit: fix test failure
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-10 ea4083848 -> 254382ebf
fix test failure
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/6d886605
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/6d886605
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/6d886605
Branch: refs/heads/feature/GEODE-2632-10
Commit: 6d886605e8e8d2bec2b7b82ddfea5824316159e0
Parents: ea40838
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 3 16:36:20 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 3 16:36:20 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/cache/client/ClientCacheFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/6d886605/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
index 4f89e98..357556e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
@@ -230,7 +230,7 @@ public class ClientCacheFactory {
}
{
String propValue = this.dsProps.getProperty(LOCATORS);
- if (isEmpty(propValue)) {
+ if (propValue != null && !propValue.isEmpty()) {
throw new IllegalStateException(
"On a client cache the locators property must be set to an empty string or not set. It was set to \""
+ propValue + "\".");
[2/2] geode git commit: fixup
Posted by kl...@apache.org.
fixup
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/254382eb
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/254382eb
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/254382eb
Branch: refs/heads/feature/GEODE-2632-10
Commit: 254382ebfbf7c4dffb7bf75a326857fa272d747f
Parents: 6d88660
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 3 16:36:41 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 3 16:36:41 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/geode/cache/client/ClientCacheFactory.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/254382eb/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
index 357556e..0d678ca 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.client;
-import static org.apache.commons.lang.StringUtils.isEmpty;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;