1 files changed, 36 insertions, 7 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
index dbefeb61f2..dcbfd89298 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
@@ -26,12 +26,13 @@
  */
 package org.apache.qpid.server.output;
 
+import org.apache.qpid.framing.MethodRegistry;
+import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.server.output.ProtocolOutputConverter.Factory;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.framing.ProtocolVersion;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 public class ProtocolOutputConverterRegistry
 {
@@ -42,15 +43,19 @@ public class ProtocolOutputConverterRegistry
 
     static
     {
-        register(ProtocolVersion.v8_0, org.apache.qpid.server.output.amqp0_8.ProtocolOutputConverterImpl.getInstanceFactory());
-        register(ProtocolVersion.v0_9, org.apache.qpid.server.output.amqp0_9.ProtocolOutputConverterImpl.getInstanceFactory());
-        register(ProtocolVersion.v0_91, org.apache.qpid.server.output.amqp0_9_1.ProtocolOutputConverterImpl.getInstanceFactory());
+        register(ProtocolVersion.v8_0);
+        register(ProtocolVersion.v0_9);
+        register(ProtocolVersion.v0_91);
     }
 
-    private static void register(ProtocolVersion version, Factory converter)
+    private ProtocolOutputConverterRegistry()
+    {
+    }
+
+    private static void register(ProtocolVersion version)
     {
 
-        _registry.put(version,converter);
+        _registry.put(version,new ConverterFactory(version));
     }
 
 
@@ -58,4 +63,28 @@ public class ProtocolOutputConverterRegistry
     {
         return _registry.get(session.getProtocolVersion()).newInstance(session);
     }
+
+    private static class ConverterFactory implements Factory
+    {
+        private ProtocolVersion _protocolVersion;
+        private MethodRegistry _methodRegistry;
+        private int _classId;
+
+        public ConverterFactory(ProtocolVersion pv)
+        {
+            _protocolVersion = pv;
+
+        }
+
+        public synchronized ProtocolOutputConverter newInstance(AMQProtocolSession session)
+        {
+            if(_methodRegistry == null)
+            {
+
+                _methodRegistry = MethodRegistry.getMethodRegistry(_protocolVersion);
+
+            }
+            return new ProtocolOutputConverterImpl(session, _methodRegistry);
+        }
+    }
 }