[geode] branch develop updated: GEODE-4386: Correct check in the case where JNDI binding does not exist

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0297afd  GEODE-4386: Correct check in the case where JNDI binding does not exist
0297afd is described below

commit 0297afdd80098364d55d476160d42820581dd320
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Mon Apr 2 07:48:17 2018 -0700

    GEODE-4386: Correct check in the case where JNDI binding does not exist
---
 .../management/internal/cli/commands/DescribeJndiBindingCommand.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
index 6174b02..cc2f086 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
@@ -57,7 +57,8 @@ public class DescribeJndiBindingCommand extends InternalGfshCommand {
       CacheConfig cacheConfig = ccService.getCacheConfig("cluster");
       List<JndiBindingsType.JndiBinding> jndiBindings = cacheConfig.getJndiBindings();
 
-      if (jndiBindings.size() == 0) {
+      if (jndiBindings.stream().noneMatch(b -> b.getJndiName().equals(bindingName)
+          || b.getJndiName().equals("java:" + bindingName))) {
         return ResultBuilder
             .createUserErrorResult(String.format("JNDI binding : %s not found", bindingName));
       }

-- 
To stop receiving notification emails like this one, please contact
jensdeppe@apache.org.