Handle nowait parameter correctly in ApiGen

Author: Emile Joubert

projects/client/Apigen/src/apigen/Apigen.cs

@@ -1066,6 +1066,8 @@ public void EmitModelMethod(MethodInfo method) {
                 EmitLine("        ModelSend(__req,"+contentHeaderExpr+","+contentBodyExpr+");");
                 if (method.ReturnType != typeof(void)) {
                     EmitLine("        return "+nowaitExpression+";");
+                } else {
+                    EmitLine("        return;");
                 }
                 EmitLine("      }");
             }

projects/client/Unit/src/unit/TestApiGen.cs

@@ -0,0 +1,105 @@
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 1.1.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial
+//   Technologies LLC., and Rabbit Technologies Ltd.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v1.1:
+//
+//---------------------------------------------------------------------------
+//   The contents of this file are subject to the Mozilla Public License
+//   Version 1.1 (the "License"); you may not use this file except in
+//   compliance with the License. You may obtain a copy of the License at
+//   http://www.rabbitmq.com/mpl.html
+//
+//   Software distributed under the License is distributed on an "AS IS"
+//   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//   License for the specific language governing rights and limitations
+//   under the License.
+//
+//   The Original Code is The RabbitMQ .NET Client.
+//
+//   The Initial Developers of the Original Code are LShift Ltd,
+//   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+//   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+//   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+//   Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
+//   Ltd. Portions created by Cohesive Financial Technologies LLC are
+//   Copyright (C) 2007-2010 Cohesive Financial Technologies
+//   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+//   (C) 2007-2010 Rabbit Technologies Ltd.
+//
+//   All Rights Reserved.
+//
+//   Contributor(s): ______________________________________.
+//
+//---------------------------------------------------------------------------
+using NUnit.Framework;
+using System.IO;
+using System.Threading;
+
+using RabbitMQ.Client.Impl;
+using RabbitMQ.Client.Exceptions;
+using RabbitMQ.Client.Events;
+using RabbitMQ.Util;
+using System;
+
+
+namespace RabbitMQ.Client.Unit
+{
+    [TestFixture]
+    public class TestApiGen
+    {
+        IConnection Connection;
+        IModel Channel;
+        String exchangeName = "nowait-test-exchange";
+
+        [SetUp] public void Connect()
+        {
+            Connection = new ConnectionFactory().CreateConnection();
+            Channel = Connection.CreateModel();
+        }
+
+        [TearDown] public void Disconnect()
+        {
+            try {
+                Channel.ExchangeDelete(exchangeName, false, false);
+            } catch (OperationInterruptedException) {}
+            Connection.Abort();
+        }
+
+        [Test, Timeout(1000)]
+        public void TestExchangeDeclareNoWait()
+        {
+            Channel.ExchangeDeclare(exchangeName, "direct", 
+                                    false, false, true, false, true, null);
+        }
+
+        [Test]
+        public void TestExchangeDeleteNoWait()
+        {
+            Channel.ExchangeDeclare(exchangeName, "direct");
+            Channel.ExchangeDelete(exchangeName, false, true);
+        }
+    }
+}