[ambari] 08/20: AMBARI-21849 : Addendum to fix checkstyle issues and null check (mradhakrishnan)

[mradhakrishnan]

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

mradhakrishnan pushed a commit to branch AMBARI-24711
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 4cfd7a9815afea337fd757bd7d12b2d3e9eb1164
Author: Madhuvanthi Radhakrishnan <mradhakrish...@hortonworks.com>
AuthorDate: Wed Aug 30 14:52:54 2017 -0700

    AMBARI-21849 : Addendum to fix checkstyle issues and null check 
(mradhakrishnan)
---
 .../java/org/apache/ambari/server/api/services/AmbariMetaInfo.java    | 4 +++-
 .../ambari/server/controller/internal/MpackResourceProvider.java      | 4 +++-
 .../ambari/server/controller/internal/MpackResourceProviderTest.java  | 3 ---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 6ae0e1c..1fa30ef 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -665,7 +665,9 @@ public class AmbariMetaInfo {
    * @throws ResourceAlreadyExistsException
    */
   public MpackResponse registerMpack(MpackRequest mpackRequest) throws 
IOException, ResourceAlreadyExistsException {
-    versionDefinitions.clear();
+    if (versionDefinitions != null) {
+      versionDefinitions.clear();
+    }
     return mpackManager.registerMpack(mpackRequest);
   }
 
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
index c4833d1..70b6d74 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
@@ -56,11 +56,13 @@ import org.apache.ambari.server.orm.dao.StackDAO;
 import org.apache.ambari.server.orm.entities.MpackEntity;
 import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.Packlet;
-
 import org.apache.ambari.server.state.StackId;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.Validate;
 
+import com.google.inject.Inject;
+
+
 /**
  * ResourceProvider for Mpack instances
  */
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java
index 0e38b08..944e40d 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java
@@ -17,13 +17,10 @@
  */
 package org.apache.ambari.server.controller.internal;
 
-import org.apache.commons.io.IOUtils;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-import java.net.URI;
-import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;