Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Dec 12, 2014 · 70497fd · 70497fd
2 parents eeca406 + 2c37a39
commit 70497fd
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
@@ -395,10 +395,20 @@ public void applyState() {
 
         try {
             PrismObject<ResourceType> resource = resourceModel.getObject();
+
+            if(StringUtils.isNotEmpty(resource.getOid())){
+                newResource = false;
+            } else {
+                newResource = true;
+            }
+
             page.getPrismContext().adopt(resource);
-            resource.findOrCreateContainer(ResourceType.F_CONNECTOR_CONFIGURATION)
-                    .findOrCreateContainer(SchemaConstants.ICF_CONFIGURATION_PROPERTIES)
-                    .createNewValue();
+
+            if(newResource){
+                resource.findOrCreateContainer(ResourceType.F_CONNECTOR_CONFIGURATION)
+                        .findOrCreateContainer(SchemaConstants.ICF_CONFIGURATION_PROPERTIES)
+                        .createNewValue();
+            }
 
             DropDownFormGroup connectorTypeDropDown = ((DropDownFormGroup)get(ID_CONNECTOR_TYPE));
             if(connectorTypeDropDown != null && connectorTypeDropDown.getInput() != null){
@@ -417,12 +427,6 @@ public void applyState() {
                 }
             }
 
-            if(StringUtils.isNotEmpty(resource.getOid())){
-                newResource = false;
-            } else {
-                newResource = true;
-            }
-
             ObjectDelta delta;
             if (!newResource) {
                 PrismObject<ResourceType> oldResource = WebModelUtils.loadObject(ResourceType.class, resource.getOid(),