[geode] branch feature/GEODE-6459 updated: Fix existing CreateMappingCommandTest

[jchen21]

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

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


The following commit(s) were added to refs/heads/feature/GEODE-6459 by this 
push:
     new 82ae2a8  Fix existing CreateMappingCommandTest
82ae2a8 is described below

commit 82ae2a8e4cd91e157e8ecdbf7a4d50dbf012d1cb
Author: Darrel Schneider <dschnei...@pivotal.io>
AuthorDate: Thu Feb 28 09:41:16 2019 -0800

    Fix existing CreateMappingCommandTest
    
    Co-authored-by: Darrel Schneider <dschnei...@pivotal.io>
    Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
 .../jdbc/internal/cli/CreateMappingCommand.java          | 16 ++++++++++------
 .../jdbc/internal/cli/CreateMappingCommandTest.java      |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
index 492efb0..953dace 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -169,9 +169,11 @@ public class CreateMappingCommand extends 
SingleGfshCommand {
     } catch (PreconditionException ex) {
       return ResultModel.createError(ex.getMessage());
     }
-    ManagementAgent agent = ((SystemManagementService) 
getManagementService()).getManagementAgent();
-    RemoteStreamExporter exporter = agent.getRemoteStreamExporter();
+
     if (pdxClassFile != null) {
+      ManagementAgent agent =
+          ((SystemManagementService) 
getManagementService()).getManagementAgent();
+      RemoteStreamExporter exporter = agent.getRemoteStreamExporter();
       remoteInputStreamName = FilenameUtils.getName(tempPdxClassFilePath);
       remoteInputStream =
           exporter.export(new SimpleRemoteInputStream(new 
FileInputStream(tempPdxClassFilePath)));
@@ -181,10 +183,12 @@ public class CreateMappingCommand extends 
SingleGfshCommand {
         executeFunctionAndGetFunctionResult(new 
CreateMappingPreconditionCheckFunction(),
             new Object[] {mapping, remoteInputStreamName, remoteInputStream},
             targetMembers.iterator().next());
-    try {
-      remoteInputStream.close(true);
-    } catch (IOException ex) {
-      // Ignored. the stream may have already been closed.
+    if (remoteInputStream != null) {
+      try {
+        remoteInputStream.close(true);
+      } catch (IOException ex) {
+        // Ignored. the stream may have already been closed.
+      }
     }
     if (preconditionCheckResult.isSuccessful()) {
       Object[] preconditionOutput = (Object[]) 
preconditionCheckResult.getResultObject();
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
index 79214b3..a2cbbed 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
@@ -84,7 +84,7 @@ public class CreateMappingCommandTest {
     dataSourceName = "connection";
     tableName = "testTable";
     pdxClass = "myPdxClass";
-    pdxClassFile = "myPdxClassFile";
+    pdxClassFile = null;
     group1Name = "group1";
     group2Name = "group2";
     cache = mock(InternalCache.class);