commit 98c194103de11742b8785bdca49816265a84c32f
author Jens Geyer <jensg@apache.org> Wed Mar 20 21:53:13 2019 +0100
committer Jens Geyer <jensg@apache.org> Thu Mar 21 09:01:50 2019 +0100
tree 527c61bd31243cad8d9cd6d4a159e8c7f7a00f9b
parent 00dd9b6ff576c995136912d5964c0cbfbf7d369b

THRIFT-4829 HTTP server transport lacks TransportFactory arguments
Client: netstd
Patch: Jens Geyer

This closes #1766

lib/netstd/Thrift/Transport/Server/THttpServerTransport.cs

diff --git a/lib/netstd/Thrift/Transport/Server/THttpServerTransport.cs b/lib/netstd/Thrift/Transport/Server/THttpServerTransport.cs
index fab9fa7..953db70 100644
--- a/lib/netstd/Thrift/Transport/Server/THttpServerTransport.cs
+++ b/lib/netstd/Thrift/Transport/Server/THttpServerTransport.cs
@@ -38,21 +38,34 @@
         protected ITProtocolFactory InputProtocolFactory;
         protected ITProtocolFactory OutputProtocolFactory;
 
+        protected TTransportFactory InputTransportFactory;
+        protected TTransportFactory OutputTransportFactory;
+
         protected ITAsyncProcessor Processor;
 
         public THttpServerTransport(ITAsyncProcessor processor, RequestDelegate next = null, ILoggerFactory loggerFactory = null)
-            : this(processor, new TBinaryProtocol.Factory(), next, loggerFactory)
+            : this(processor, new TBinaryProtocol.Factory(), null, next, loggerFactory)
         {
         }
 
-        public THttpServerTransport(ITAsyncProcessor processor, ITProtocolFactory protocolFactory, RequestDelegate next = null,
+        public THttpServerTransport(
+            ITAsyncProcessor processor, 
+            ITProtocolFactory protocolFactory, 
+            TTransportFactory transFactory = null, 
+            RequestDelegate next = null,
             ILoggerFactory loggerFactory = null)
-            : this(processor, protocolFactory, protocolFactory, next, loggerFactory)
+            : this(processor, protocolFactory, protocolFactory, transFactory, transFactory, next, loggerFactory)
         {
         }
 
-        public THttpServerTransport(ITAsyncProcessor processor, ITProtocolFactory inputProtocolFactory,
-            ITProtocolFactory outputProtocolFactory, RequestDelegate next = null, ILoggerFactory loggerFactory = null)
+        public THttpServerTransport(
+            ITAsyncProcessor processor, 
+            ITProtocolFactory inputProtocolFactory,
+            ITProtocolFactory outputProtocolFactory,
+            TTransportFactory inputTransFactory = null,
+            TTransportFactory outputTransFactory = null,
+            RequestDelegate next = null, 
+            ILoggerFactory loggerFactory = null)
         {
             // loggerFactory == null is not illegal anymore
 
@@ -60,6 +73,9 @@
             InputProtocolFactory = inputProtocolFactory ?? throw new ArgumentNullException(nameof(inputProtocolFactory));
             OutputProtocolFactory = outputProtocolFactory ?? throw new ArgumentNullException(nameof(outputProtocolFactory));
 
+            InputTransportFactory = inputTransFactory;
+            OutputTransportFactory = outputTransFactory;
+
             _next = next;
             _logger = (loggerFactory != null) ? loggerFactory.CreateLogger<THttpServerTransport>() : new NullLogger<THttpServerTransport>();
         }
@@ -76,8 +92,11 @@
 
             try
             {
-                var input = InputProtocolFactory.GetProtocol(transport);
-                var output = OutputProtocolFactory.GetProtocol(transport);
+                var intrans = (InputTransportFactory != null) ? InputTransportFactory.GetTransport(transport) : transport;
+                var outtrans = (OutputTransportFactory != null) ? OutputTransportFactory.GetTransport(transport) : transport;
+
+                var input = InputProtocolFactory.GetProtocol(intrans);
+                var output = OutputProtocolFactory.GetProtocol(outtrans);
 
                 while (await Processor.ProcessAsync(input, output, cancellationToken))
                 {
@@ -86,6 +105,8 @@
             catch (TTransportException)
             {
                 // Client died, just move on
+                if (!context.Response.HasStarted)
+                    context.Response.StatusCode = 500;
             }
             finally
             {