From: Tony Tkacik <ttkacik@cisco.com>
Date: Sun, 3 Aug 2014 18:10:03 +0000 (+0000)
Subject: Merge "BUG 1082 Migrate sal-rest-connector to Async Data Broker API"
X-Git-Tag: release/helium~359
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=eb887b1c2c8cd2768f8b4c2ed2b5054f97798466

Merge "BUG 1082 Migrate sal-rest-connector to Async Data Broker API"
---

eb887b1c2c8cd2768f8b4c2ed2b5054f97798466
diff --cc opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
index 559be5aa6f,bef1be2ed1..2fa99819d5
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
@@@ -37,15 -36,15 +36,15 @@@ public class RestconfProviderImpl imple
  
      @Override
      public void onSessionInitiated(ProviderSession session) {
-         DataBrokerService dataService = session.getService(DataBrokerService.class);
+         final DOMDataBroker domDataBroker = session.getService(DOMDataBroker.class);
  
          BrokerFacade.getInstance().setContext(session);
-         BrokerFacade.getInstance().setDataService(dataService);
+         BrokerFacade.getInstance().setDomDataBroker( domDataBroker);
  
          SchemaService schemaService = session.getService(SchemaService.class);
 -        listenerRegistration = schemaService.registerSchemaServiceListener(ControllerContext.getInstance());
 +        listenerRegistration = schemaService.registerSchemaContextListener(ControllerContext.getInstance());
          ControllerContext.getInstance().setSchemas(schemaService.getGlobalContext());
-         ControllerContext.getInstance().setMountService(session.getService(MountService.class));
+         ControllerContext.getInstance().setMountService(session.getService(DOMMountPointService.class));
  
          webSocketServerThread = new Thread(WebSocketServer.createInstance(port.getValue().intValue()));
          webSocketServerThread.setName("Web socket server on port " + port);