Driver changes

src/BasicTransport.cc

Index: src/BasicTransport.cc
diff --git a/src/BasicTransport.cc b/src/BasicTransport.cc
index 7127e701afd624dfc2e577662d017e23ae75d7e8..ed96690c9c9ba76eedf95a1ea012b6f3df76512d 100644
--- a/src/BasicTransport.cc
+++ b/src/BasicTransport.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016 Stanford University
+/* Copyright (c) 2015-2017 Stanford University
  *
  * Permission to use, copy, modify, and distribute this software for any purpose
  * with or without fee is hereby granted, provided that the above copyright
@@ -59,6 +59,7 @@ BasicTransport::BasicTransport(Context* context, const ServiceLocator* locator,
         Driver* driver, uint64_t clientId)
     : context(context)
     , driver(driver)
+    , locatorString("basic+"+driver->getServiceLocator())
     , poller(context, this)
     , maxDataPerPacket(driver->getMaxPacketSize() - sizeof32(DataHeader))
     , clientId(clientId)
@@ -125,14 +126,13 @@ BasicTransport::~BasicTransport()
         ClientRpc* clientRpc = it->second;
         deleteClientRpc(clientRpc);
     }
-    delete driver;
 }
 
 // See Transport::getServiceLocator().
 string
 BasicTransport::getServiceLocator()
 {
-    return driver->getServiceLocator();
+    return locatorString;
 }
 
 /*