fix npe

xrogzu · Nov 22, 2016 · 8d8e88c · 8d8e88c
1 parent cf6700e
commit 8d8e88c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ain/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java b/...ain/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java
@@ -122,7 +122,7 @@ public void releaseHistoryConversion(
         releaseHistories.add(releaseHistory);
 
         //rollback
-        if (release.isAbandoned()) {
+        if (release.isAbandoned() && previousRelease != null) {
           releaseHistory.setDataChangeLastModifiedTime(release.getDataChangeCreatedTime());
           ReleaseHistory rollBackReleaseHistory = assembleReleaseHistory(previousRelease,
               ReleaseOperation.ROLLBACK, release.getId());

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
@@ -220,11 +220,12 @@ private Release publishBranchNamespace(Namespace parentNamespace, Namespace chil
     Map<String, String> parentConfigurations = parentLatestRelease != null ?
                                                gson.fromJson(parentLatestRelease.getConfigurations(),
                                                              configurationTypeReference) : new HashMap<>();
+    long baseReleaseId = parentLatestRelease == null ? 0 : parentLatestRelease.getId();
 
     Map<String, String> childNamespaceToPublishConfigs = mergeConfiguration(parentConfigurations, childNamespaceItems);
     Release release =
         branchRelease(parentNamespace, childNamespace, releaseName, releaseComment,
-                      childNamespaceToPublishConfigs, parentLatestRelease.getId(), operator,
+                      childNamespaceToPublishConfigs, baseReleaseId, operator,
                       ReleaseOperation.GRAY_RELEASE);
 
     return release;