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%2Foperations%2Feditconfig%2FMergeEditConfigStrategy.java;h=d3d5bd90a778231eaa03b11cdf1e6dd5606b98f0;hb=29b9c54138908b559d352c344966a73c22c5a6c3;hp=d8ceb311038e6f0602832448a32de27db6d3e664;hpb=79202e1fd05d2606b35e163f608fad9cce84b5d4;p=controller.git

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
index d8ceb31103..d3d5bd90a7 100644
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public class MergeEditConfigStrategy extends AbstractEditConfigStrategy {
 
-    private static final Logger logger = LoggerFactory.getLogger(MergeEditConfigStrategy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MergeEditConfigStrategy.class);
 
     public MergeEditConfigStrategy() {
 
@@ -52,7 +52,7 @@ public class MergeEditConfigStrategy extends AbstractEditConfigStrategy {
                 AttributeConfigElement ace = configAttributeEntry.getValue();
 
                 if (!ace.getResolvedValue().isPresent()) {
-                    logger.debug("Skipping attribute {} for {}", configAttributeEntry.getKey(), on);
+                    LOG.debug("Skipping attribute {} for {}", configAttributeEntry.getKey(), on);
                     continue;
                 }
 
@@ -63,9 +63,9 @@ public class MergeEditConfigStrategy extends AbstractEditConfigStrategy {
                 // Merge value with currentValue
                 toBeMergedIn = merge(oldValue, toBeMergedIn);
                 ta.setAttribute(on, ace.getJmxName(), new Attribute(ace.getJmxName(), toBeMergedIn));
-                logger.debug("Attribute {} set to {} for {}", configAttributeEntry.getKey(), toBeMergedIn, on);
+                LOG.debug("Attribute {} set to {} for {}", configAttributeEntry.getKey(), toBeMergedIn, on);
             } catch (Exception e) {
-                logger.error("Error while merging objectnames of {}", on, e);
+                LOG.error("Error while merging objectnames of {}", on, e);
                 throw new NetconfConfigHandlingException(String.format("Unable to set attributes for %s, Error with attribute %s : %s ",
                         on,
                         configAttributeEntry.getKey(),