- Remove the explicit close method in SessionManager. Just do it in destructor instead.

- Destruct instead of close. Works even if it has not been constructed.
- Minor code cleanup.

1 files changed, 10 insertions, 10 deletions

diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index ca689d4c4c6..fd6f6af730c 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -126,16 +126,16 @@ struct EmptyRankingAssetsRepo : public proton::matching::IRankingAssetsRepo {
 //-----------------------------------------------------------------------------
 
 struct MyWorld {
-    Schema                  schema;
-    Properties              config;
-    FakeSearchContext       searchContext;
-    MockAttributeContext    attributeContext;
-    SessionManager::SP      sessionManager;
-    DocumentMetaStore       metaStore;
-    MatchingStats           matchingStats;
-    vespalib::TestClock     clock;
-    QueryLimiter            queryLimiter;
-    EmptyRankingAssetsRepo  constantValueRepo;
+    Schema                           schema;
+    Properties                       config;
+    FakeSearchContext                searchContext;
+    MockAttributeContext             attributeContext;
+    std::shared_ptr<SessionManager>  sessionManager;
+    DocumentMetaStore                metaStore;
+    MatchingStats                    matchingStats;
+    vespalib::TestClock              clock;
+    QueryLimiter                     queryLimiter;
+    EmptyRankingAssetsRepo           constantValueRepo;
 
     MyWorld();
     ~MyWorld();