Fix Operation not permitted warning.

[controller.git] / opendaylight / netconf / config-netconf-connector / src / main / java / org / opendaylight / controller / netconf / confignetconfconnector / mapping / config / ModuleElementDefinition.java

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 d1c3ebeb0d212f52805f8200636c4dae8b6be8b5..b772eee0d7a9f3b37a5c8854cfe6b9d1650270b2 100644 (file)
--- 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,20 +27,22 @@ public class ModuleElementDefinition {
 
     public ModuleElementDefinition(String instanceName, String currentStrategy, EditStrategyType defaultStrategy) {
         this.instanceName = instanceName;
 
     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() {
     }
 
     public String getInstanceName() {