svn commit: r790315 - in /activemq/sandbox/activemq-flow: activemq-broker/src/main/java/org/apache/activemq/apollo/transport/vm/VMTransportFactory.java activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java

[chirino]

Author: chirino
Date: Wed Jul  1 19:10:45 2009
New Revision: 790315

URL: http://svn.apache.org/viewvc?rev=790315&view=rev
Log:
small fix to allow using a null wireformat.

Modified:
    
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/transport/vm/VMTransportFactory.java
    
activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java

Modified: 
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/transport/vm/VMTransportFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/transport/vm/VMTransportFactory.java?rev=790315&r1=790314&r2=790315&view=diff
==============================================================================
--- 
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/transport/vm/VMTransportFactory.java
 (original)
+++ 
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/transport/vm/VMTransportFactory.java
 Wed Jul  1 19:10:45 2009
@@ -145,7 +145,7 @@
                                }
                                
                                // We want to use a vm transport server impl.
-                               VmTransportServer vmTransportServer = 
(VmTransportServer) TransportFactory.bind(new URI("vm://" + 
name+"?wireFormat=mock"));
+                               VmTransportServer vmTransportServer = 
(VmTransportServer) TransportFactory.bind(new URI("vm://" + 
name+"?wireFormat=null"));
                                vmTransportServer.setBroker(broker);
                                
vmTransportServer.setWireFormatFactory(wf.getWireFormatFactory());
                                broker.addTransportServer(vmTransportServer);

Modified: 
activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java?rev=790315&r1=790314&r2=790315&view=diff
==============================================================================
--- 
activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java
 (original)
+++ 
activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java
 Wed Jul  1 19:10:45 2009
@@ -211,6 +211,9 @@
 
     protected WireFormat createWireFormat(Map<String, String> options) throws 
IOException {
         WireFormatFactory factory = createWireFormatFactory(options);
+        if( factory == null ) {
+            return null;
+        }
         WireFormat format = factory.createWireFormat();
         return format;
     }
@@ -220,6 +223,9 @@
         if (wireFormat == null) {
             wireFormat = getDefaultWireFormatType();
         }
+        if( "null".equals(wireFormat) ) {
+            return null;
+        }
 
         try {
             WireFormatFactory wff = 
(WireFormatFactory)WIREFORMAT_FACTORY_FINDER.newInstance(wireFormat);