X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fconfig%2FModuleElementDefinition.java;h=92b7a487e08cd00397f7cb943055c0e9d2660be4;hb=80aa861b74f7b0b3574f0962cdb45740ff71946c;hp=d1c3ebeb0d212f52805f8200636c4dae8b6be8b5;hpb=9c9f6e506395f806978a955a8cf51ba736b978ad;p=controller.git

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java
index d1c3ebeb0d..92b7a487e0 100644
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java
@@ -27,30 +27,28 @@ public class ModuleElementDefinition {
 
     public ModuleElementDefinition(String instanceName, String currentStrategy, EditStrategyType defaultStrategy) {
         this.instanceName = instanceName;
-        EditStrategyType _edStrategy = null;
-        try {
-            _edStrategy = InstanceConfigElementResolved.parseStrategy(currentStrategy, defaultStrategy);
-        } catch (OperationNotPermittedException e) {
-            _edStrategy = defaultStrategy;
-            logger.warn("Operation not permitted on current strategy {} while default strategy is {}. Element definition strategy set to default.",
-                    currentStrategy,
-                    defaultStrategy,
-                    e);
+        if (currentStrategy == null || currentStrategy.isEmpty()) {
+            this.editStrategy = defaultStrategy;
+        } else {
+            EditStrategyType _edStrategy = null;
+            try {
+                _edStrategy = InstanceConfigElementResolved.parseStrategy(currentStrategy, defaultStrategy);
+            } catch (OperationNotPermittedException e) {
+                _edStrategy = defaultStrategy;
+                logger.warn("Operation not permitted on current strategy {} while default strategy is {}. Element definition strategy set to default.",
+                        currentStrategy,
+                        defaultStrategy,
+                        e);
+            }
+            this.editStrategy = _edStrategy;
         }
-        if (currentStrategy == null || currentStrategy.isEmpty())
-            _edStrategy = defaultStrategy;
 
-        this.editStrategy = _edStrategy;
     }
 
     public String getInstanceName() {
         return instanceName;
     }
 
-    public EditStrategyType getEditStrategyType() {
-        return editStrategy;
-    }
-
     public EditConfigStrategy getEditStrategy() {
         switch (editStrategy) {
             case delete :