New Dispatch Interceptor (see bug #2126)

1 files changed, 59 insertions, 0 deletions

diff --git a/cpp/src/Ice/DispatchInterceptor.cpp b/cpp/src/Ice/DispatchInterceptor.cpp
new file mode 100644
index 00000000000..eb128af15ce
--- /dev/null
+++ b/cpp/src/Ice/DispatchInterceptor.cpp
@@ -0,0 +1,59 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/DispatchInterceptor.h>
+#include <Ice/IncomingRequest.h>
+#include <Ice/Direct.h>
+#include <Ice/LocalException.h>
+
+using namespace Ice;
+using namespace IceInternal;
+
+DispatchStatus
+Ice::DispatchInterceptor::__dispatch(IceInternal::Incoming& in, const Current& current)
+{
+    try
+    {
+        IncomingRequest request(in);
+        DispatchStatus status = dispatch(request);
+        if(status != DispatchAsync)
+        {
+            //
+            // Make sure 'in' owns the connection etc.
+            //
+            in.killAsync();
+        }
+        return status;
+    }
+    catch(const ResponseSentException&)
+    {
+        return DispatchAsync;
+    }
+    catch(...)
+    {
+        try
+        {
+            in.killAsync();
+        }
+        catch(const ResponseSentException&)
+        {
+            return DispatchAsync;
+        }
+        throw;
+    }
+}
+    
+DispatchStatus
+Ice::DispatchInterceptor::__collocDispatch(Direct& request)
+{
+    //
+    // Should only return DispatchOK or DispatchUserException
+    //
+    return dispatch(request);
+}