Merge pull request apolloconfig#659 from lepdou/bugfix_appnamespace

Bugfix: check application namespace existed
paulzhangcc · Jul 14, 2017 · 7b3551e · 7b3551e
2 parents d010aa5 + 56b195e
commit 7b3551e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...o-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java b/...o-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java
@@ -46,18 +46,19 @@ public AppNamespace findByAppIdAndName(String appId, String namespaceName) {
 
   @Transactional
   public void createDefaultAppNamespace(String appId) {
-    if (!isAppNamespaceNameUnique(appId, appId)) {
-      throw new ServiceException("appnamespace not unique");
+    if (!isAppNamespaceNameUnique(appId, ConfigConsts.NAMESPACE_APPLICATION)) {
+      throw new BadRequestException(String.format("App already has application namespace. AppId = %s", appId));
     }
+
     AppNamespace appNs = new AppNamespace();
     appNs.setAppId(appId);
     appNs.setName(ConfigConsts.NAMESPACE_APPLICATION);
     appNs.setComment("default app namespace");
     appNs.setFormat(ConfigFileFormat.Properties.getValue());
-
     String userId = userInfoHolder.getUser().getUserId();
     appNs.setDataChangeCreatedBy(userId);
     appNs.setDataChangeLastModifiedBy(userId);
+
     appNamespaceRepository.save(appNs);
   }