Address review

1 files changed, 4 insertions, 2 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
index 9a889f72115..0ce83a3c204 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
@@ -261,8 +261,10 @@ public class DocumentProtocol implements Protocol {
                              DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) {
         if (docMan != null)
             this.docMan = docMan;
-        else
-            DocumentTypeManagerConfigurer.configure(this.docMan = new DocumentTypeManager(), configId);
+        else {
+            this.docMan = new DocumentTypeManager();
+            DocumentTypeManagerConfigurer.configure(this.docMan, configId);
+        }
         this.routableRepository = new RoutableRepository(set);
 
         // When adding factories to this list, please KEEP THEM ORDERED alphabetically like they are now.