[geode] branch feature/GEODE-6511 updated: Fix failed test

[jchen21]

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

jchen21 pushed a commit to branch feature/GEODE-6511
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-6511 by this 
push:
     new 8e4db99  Fix failed test
8e4db99 is described below

commit 8e4db995a9616397286f00a9a7ea7a13871d9dff
Author: Ben Ross <br...@pivotal.io>
AuthorDate: Wed Mar 13 09:57:07 2019 -0700

    Fix failed test
    
    Co-authored-by: Ben Ross <br...@pivotal.io>
    Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
 .../cli/functions/DestroyJndiBindingFunctionTest.java       |  2 +-
 .../java/org/apache/geode/internal/jndi/JNDIInvoker.java    | 13 ++++++-------
 .../internal/cli/functions/DestroyJndiBindingFunction.java  |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
index 3717fdc..87758b4 100644
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
@@ -134,7 +134,7 @@ public class DestroyJndiBindingFunctionTest {
     when(context.getArguments()).thenReturn(new Object[] {"jndi1", true});
     when(context.getResultSender()).thenReturn(resultSender);
     DestroyJndiBindingFunction destroyFunctionSpy = 
spy(destroyJndiBindingFunction);
-    doReturn(true).when(destroyFunctionSpy).checkForInvalidDataSource(any());
+    doReturn(false).when(destroyFunctionSpy).isValidDataSource(any());
 
     destroyFunctionSpy.execute(context);
     verify(resultSender).lastResult(resultCaptor.capture());
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java 
b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
index 944673e..8380539 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
@@ -405,16 +405,15 @@ public class JNDIInvoker {
     }
   }
 
-  public static boolean checkForInvalidDataSource(String name) {
+  public static boolean isValidDataSource(String name) {
     Object dataSource = dataSourceMap.get(name);
 
-    if (dataSource != null) {
-      if (dataSource instanceof DataSource
-          && !(dataSource instanceof GemFireTransactionDataSource)) {
-        return false;
-      }
+    if (dataSource == null || (dataSource != null && dataSource instanceof 
DataSource
+        && !(dataSource instanceof GemFireTransactionDataSource))) {
+      return true;
     }
-    return true;
+
+    return false;
   }
 
   /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunction.java
 
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunction.java
index a31d8bd..eba763e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunction.java
+++ 
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunction.java
@@ -32,7 +32,7 @@ public class DestroyJndiBindingFunction extends 
CliFunction<Object[]> {
 
     if (destroyingDataSource) {
       typeName = "Data source";
-      if (checkForInvalidDataSource(jndiName)) {
+      if (!isValidDataSource(jndiName)) {
         return new CliFunctionResult(context.getMemberName(), 
CliFunctionResult.StatusState.ERROR,
             CliStrings.format(
                 "Data Source {0} has invalid type for destroy data-source, 
destroy jndi-binding command should be used.",
@@ -53,7 +53,7 @@ public class DestroyJndiBindingFunction extends 
CliFunction<Object[]> {
     }
   }
 
-  boolean checkForInvalidDataSource(String jndiName) {
-    return JNDIInvoker.checkForInvalidDataSource(jndiName);
+  boolean isValidDataSource(String jndiName) {
+    return JNDIInvoker.isValidDataSource(jndiName);
   }
 }