Merge pull request #318 from lepdou/bugfix0708

bugfix when create app namespace jump to permission page

Merge pull request #318 from lepdou/bugfix0708
39455953 · Jason Song · GitHub · 58fcb8ad · 9ca5e2d8 · 39455953
Commit 39455953 authored Jul 08, 2016 by Jason Song Committed by GitHub Jul 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

AppNamespaceController.java ...pollo/adminservice/controller/AppNamespaceController.java +2 -2

No files found.
--- a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java
+++ b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java
@@ -33,8 +33,8 @@ public class AppNamespaceController {
      throw new BadRequestException("app namespaces already exist.");
    }

-    if (StringUtils.isEmpty(appNamespace.getFormat())){
-      appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
+    if (StringUtils.isEmpty(entity.getFormat())){
+      entity.setFormat(ConfigFileFormat.Properties.getValue());
    }

    entity = appNamespaceService.createAppNamespace(entity);