- Avoid adding empty traces that you need to carry on.

- Avoid copying shared pointers when not necessary.
- Some c++11 improvements.

2 files changed, 2 insertions, 4 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
index 42e1c07f3e8..7db941a12f2 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
@@ -53,8 +53,7 @@ LocalServicePolicy::getRecipient(mbus::RoutingContext &ctx)
     CacheEntry &entry = update(ctx);
     if (entry._recipients.empty()) {
         mbus::Hop hop = ctx.getRoute().getHop(0);
-        hop.setDirective(ctx.getDirectiveIndex(),
-                         mbus::IHopDirective::SP(new mbus::VerbatimDirective("*")));
+        hop.setDirective(ctx.getDirectiveIndex(), std::make_shared<mbus::VerbatimDirective>("*"));
         return hop;
     }
     if (++entry._offset >= entry._recipients.size()) {
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
index 7e2d54f318f..7e324468ae5 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
@@ -75,8 +75,7 @@ SubsetServicePolicy::getRecipient(mbus::RoutingContext &ctx)
     }
     if (!hop.hasDirectives()) {
         hop = ctx.getRoute().getHop(0);
-        hop.setDirective(ctx.getDirectiveIndex(),
-                         mbus::IHopDirective::SP(new mbus::VerbatimDirective("*")));
+        hop.setDirective(ctx.getDirectiveIndex(),std::make_shared<mbus::VerbatimDirective>("*"));
     }
     return hop;
 }