From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 22 Jan 2014 13:29:09 +0000 (+0000)
Subject: Merge "Move NetconfUtil to netconf-util."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~23
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6b98de000257414b2ae9b1db708c0f7962a0f033;hp=07389b7beb8d85acd7739ccb1b27c5a1cf1a0ce7

Merge "Move NetconfUtil to netconf-util."
---

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
index 32e59b869e..f90465f925 100644
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
@@ -324,6 +324,8 @@ package class TwoPhaseCommit<P extends Path<P>, D, DCL extends DataChangeListene
 
 public abstract class AbstractDataTransaction<P extends Path<P>, D> extends AbstractDataModification<P, D> {
 
+    private static val LOG = LoggerFactory.getLogger(AbstractDataTransaction);
+
     @Property
     private val Object identifier;
 
@@ -336,6 +338,7 @@ public abstract class AbstractDataTransaction<P extends Path<P>, D> extends Abst
         _identifier = identifier;
         broker = dataBroker;
         status = TransactionStatus.NEW;
+        LOG.debug("Transaction {} Allocated.", identifier);
 
     //listeners = new ListenerRegistry<>();
     }
@@ -393,6 +396,7 @@ public abstract class AbstractDataTransaction<P extends Path<P>, D> extends Abst
     protected abstract def void onStatusChange(TransactionStatus status);
 
     public def changeStatus(TransactionStatus status) {
+        LOG.debug("Transaction {} transitioned from {} to {}", identifier, this.status, status);
         this.status = status;
         onStatusChange(status);
     }
diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointManagerImpl.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointManagerImpl.xtend
index 5d441bddbd..c3bc88ed5e 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointManagerImpl.xtend
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointManagerImpl.xtend
@@ -35,8 +35,8 @@ class MountPointManagerImpl implements MountProvisionService {
     }
     
     def registerMountPoint(MountPointImpl impl) {
-        dataBroker?.registerConfigurationReader(impl.mountPath,impl.readWrapper);
-        dataBroker?.registerOperationalReader(impl.mountPath,impl.readWrapper);
+        //dataBroker?.registerConfigurationReader(impl.mountPath,impl.readWrapper);
+        //dataBroker?.registerOperationalReader(impl.mountPath,impl.readWrapper);
         
     }