Skip to content

Commit 9cec5b9

Browse files
michaelklishinmichaelklishin
committed
Nowait => NoWait
Plus untabify after Xamarin Studio :/
1 parent 56c1dc4 commit 9cec5b9

File tree

4 files changed

+82
-82
lines changed

4 files changed

+82
-82
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ public void MaybeEmitModelMethod(MethodInfo method) {
832832
if (method.IsSpecialName) {
833833
// It's some kind of event- or property-related method.
834834
// It shouldn't be autogenerated.
835-
} else if (method.Name.EndsWith("Nowait")) {
835+
} else if (method.Name.EndsWith("NoWait")) {
836836
// Skip *Nowait versions
837837
} else if (Attribute(method, typeof(AmqpMethodDoNotImplementAttribute)) != null) {
838838
// Skip this method, by request (AmqpMethodDoNotImplement)

‎projects/client/RabbitMQ.Client/src/client/api/IModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void ExchangeDeclare(string exchange,
185185
/// Same as ExchangeDeclare but sets nowait to true and returns void (as there
186186
/// will be no response from the server).
187187
/// </summary>
188-
void ExchangeDeclareNowait(string exchange,
188+
void ExchangeDeclareNoWait(string exchange,
189189
string type,
190190
bool durable,
191191
bool autoDelete,
@@ -205,7 +205,7 @@ void ExchangeDeclareNowait(string exchange,
205205
///<summary>
206206
///Like ExchangeDelete but sets nowait to true.
207207
///</summary>
208-
void ExchangeDeleteNowait(string exchange, bool ifUnused);
208+
void ExchangeDeleteNoWait(string exchange, bool ifUnused);
209209

210210
///<summary>(Extension method) Bind an exchange to an exchange.</summary>
211211
[AmqpMethodDoNotImplement(null)]
@@ -223,7 +223,7 @@ void ExchangeBind(string destination,
223223
///<summary>
224224
///Like ExchangeBind but sets nowait to true.
225225
///</summary>
226-
void ExchangeBindNowait(string destination,
226+
void ExchangeBindNoWait(string destination,
227227
string source,
228228
string routingKey,
229229
IDictionary<string, object> arguments);
@@ -269,7 +269,7 @@ QueueDeclareOk QueueDeclare(string queue, bool durable, bool exclusive,
269269
/// Same as QueueDeclare but sets nowait to true and returns void (as there
270270
/// will be no response from the server).
271271
/// </summary>
272-
void QueueDeclareNowait(string queue, bool durable, bool exclusive,
272+
void QueueDeclareNoWait(string queue, bool durable, bool exclusive,
273273
bool autoDelete, IDictionary<string, object> arguments);
274274

275275
///<summary>(Spec method) Bind a queue to an exchange.</summary>
@@ -286,7 +286,7 @@ void QueueBind(string queue,
286286
string routingKey);
287287

288288
///<summary>Same as QueueBind but sets nowait parameter to true.</summary>
289-
void QueueBindNowait(string queue,
289+
void QueueBindNoWait(string queue,
290290
string exchange,
291291
string routingKey,
292292
IDictionary<string, object> arguments);
@@ -325,7 +325,7 @@ uint QueueDelete(string queue,
325325
///Same as QueueDelete but sets nowait parameter to true
326326
///and returns void (as there will be no response from the server)
327327
///</summary>
328-
void QueueDeleteNowait(string queue,
328+
void QueueDeleteNoWait(string queue,
329329
bool ifUnused,
330330
bool ifEmpty);
331331

‎projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,14 @@ protected virtual void handleAckNack(ulong deliveryTag, bool multiple, bool isNa
389389
lock(m_unconfirmedSet.SyncRoot)
390390
{
391391
if (multiple) {
392-
for (ulong i = (ulong)m_unconfirmedSet[0]; i <= deliveryTag; i++) {
393-
// removes potential duplicates
394-
while(m_unconfirmedSet.Remove(i))
395-
{}
392+
for (ulong i = (ulong)m_unconfirmedSet[0]; i <= deliveryTag; i++) {
393+
// removes potential duplicates
394+
while(m_unconfirmedSet.Remove(i))
395+
{}
396396
}
397397
} else {
398398
while(m_unconfirmedSet.Remove(deliveryTag))
399-
{}
399+
{}
400400
}
401401
m_onlyAcksReceived = m_onlyAcksReceived && !isNack;
402402
if (m_unconfirmedSet.Count == 0)
@@ -572,8 +572,8 @@ public void HandleBasicDeliver(string consumerTag,
572572
{
573573
if (DefaultConsumer == null) {
574574
throw new InvalidOperationException("Unsolicited delivery -" +
575-
" see IModel.DefaultConsumer to handle this" +
576-
" case.");
575+
" see IModel.DefaultConsumer to handle this" +
576+
" case.");
577577
}
578578
else {
579579
consumer = DefaultConsumer;
@@ -686,8 +686,8 @@ public void HandleConnectionStart(byte versionMajor,
686686
{
687687
ShutdownEventArgs reason =
688688
new ShutdownEventArgs(ShutdownInitiator.Library,
689-
CommonFraming.Constants.CommandInvalid,
690-
"Unexpected Connection.Start");
689+
CommonFraming.Constants.CommandInvalid,
690+
"Unexpected Connection.Start");
691691
((ConnectionBase)m_session.Connection).Close(reason);
692692
}
693693
ConnectionStartDetails details = new ConnectionStartDetails();
@@ -706,25 +706,25 @@ public void HandleConnectionClose(ushort replyCode,
706706
ushort methodId)
707707
{
708708
ShutdownEventArgs reason = new ShutdownEventArgs(ShutdownInitiator.Peer,
709-
replyCode,
710-
replyText,
711-
classId,
712-
methodId);
709+
replyCode,
710+
replyText,
711+
classId,
712+
methodId);
713713
try
714714
{
715715
((ConnectionBase)m_session.Connection).InternalClose(reason);
716716
_Private_ConnectionCloseOk();
717-
SetCloseReason((m_session.Connection).CloseReason);
717+
SetCloseReason((m_session.Connection).CloseReason);
718718
}
719719
catch (IOException)
720720
{
721-
// Ignored. We're only trying to be polite by sending
722-
// the close-ok, after all.
721+
// Ignored. We're only trying to be polite by sending
722+
// the close-ok, after all.
723723
}
724724
catch (AlreadyClosedException)
725725
{
726-
// Ignored. We're only trying to be polite by sending
727-
// the close-ok, after all.
726+
// Ignored. We're only trying to be polite by sending
727+
// the close-ok, after all.
728728
}
729729
}
730730

@@ -748,10 +748,10 @@ public void HandleChannelClose(ushort replyCode,
748748
ushort methodId)
749749
{
750750
SetCloseReason(new ShutdownEventArgs(ShutdownInitiator.Peer,
751-
replyCode,
752-
replyText,
753-
classId,
754-
methodId));
751+
replyCode,
752+
replyText,
753+
classId,
754+
methodId));
755755

756756
m_session.Close(m_closeReason, false);
757757
try {
@@ -797,14 +797,14 @@ public void ExchangeDeclarePassive(string exchange)
797797
_Private_ExchangeDeclare(exchange, "", true, false, false, false, false, null);
798798
}
799799

800-
public void ExchangeDeclareNowait(string exchange,
801-
string type,
802-
bool durable,
803-
bool autoDelete,
804-
IDictionary<string, object> arguments)
805-
{
806-
_Private_ExchangeDeclare(exchange, type, false, durable, autoDelete, false, true, arguments);
807-
}
800+
public void ExchangeDeclareNoWait(string exchange,
801+
string type,
802+
bool durable,
803+
bool autoDelete,
804+
IDictionary<string, object> arguments)
805+
{
806+
_Private_ExchangeDeclare(exchange, type, false, durable, autoDelete, false, true, arguments);
807+
}
808808

809809
public abstract void _Private_ExchangeDeclare(string exchange,
810810
string type,
@@ -826,7 +826,7 @@ public void ExchangeDelete(string exchange)
826826
ExchangeDelete(exchange, false);
827827
}
828828

829-
public void ExchangeDeleteNowait(string exchange,
829+
public void ExchangeDeleteNoWait(string exchange,
830830
bool ifUnused)
831831
{
832832
_Private_ExchangeDelete(exchange, ifUnused, false);
@@ -851,7 +851,7 @@ public void ExchangeBind(string destination,
851851
_Private_ExchangeBind(destination, source, routingKey, false, arguments);
852852
}
853853

854-
public void ExchangeBindNowait(string destination,
854+
public void ExchangeBindNoWait(string destination,
855855
string source,
856856
string routingKey,
857857
IDictionary<string, object> arguments)
@@ -898,14 +898,14 @@ public QueueDeclareOk QueueDeclarePassive(string queue)
898898
return QueueDeclare(queue, true, false, false, false, null);
899899
}
900900

901-
public void QueueDeclareNowait(string queue, bool durable, bool exclusive,
902-
bool autoDelete, IDictionary<string, object> arguments)
903-
{
904-
_Private_QueueDeclare(queue, false, durable, exclusive, autoDelete, true, arguments);
905-
}
901+
public void QueueDeclareNoWait(string queue, bool durable, bool exclusive,
902+
bool autoDelete, IDictionary<string, object> arguments)
903+
{
904+
_Private_QueueDeclare(queue, false, durable, exclusive, autoDelete, true, arguments);
905+
}
906906

907907
public QueueDeclareOk QueueDeclare(string queue, bool durable, bool exclusive,
908-
bool autoDelete, IDictionary<string, object> arguments)
908+
bool autoDelete, IDictionary<string, object> arguments)
909909
{
910910
return QueueDeclare(queue, false, durable, exclusive, autoDelete, arguments);
911911
}
@@ -917,7 +917,7 @@ public QueueDeclareRpcContinuation() { }
917917
}
918918

919919
private QueueDeclareOk QueueDeclare(string queue, bool passive, bool durable, bool exclusive,
920-
bool autoDelete, IDictionary<string, object> arguments)
920+
bool autoDelete, IDictionary<string, object> arguments)
921921
{
922922
QueueDeclareRpcContinuation k = new QueueDeclareRpcContinuation();
923923
Enqueue(k);
@@ -949,7 +949,7 @@ public void QueueBind(string queue,
949949
QueueBind(queue, exchange, routingKey, null);
950950
}
951951

952-
public void QueueBindNowait(string queue,
952+
public void QueueBindNoWait(string queue,
953953
string exchange,
954954
string routingKey,
955955
IDictionary<string, object> arguments)
@@ -989,7 +989,7 @@ public uint QueueDelete(string queue)
989989
return QueueDelete(queue, false, false);
990990
}
991991

992-
public void QueueDeleteNowait(string queue,
992+
public void QueueDeleteNoWait(string queue,
993993
bool ifUnused,
994994
bool ifEmpty)
995995
{
@@ -1037,7 +1037,7 @@ public bool WaitForConfirms(TimeSpan timeout, out bool timedOut)
10371037
{
10381038
TimeSpan elapsed = stopwatch.Elapsed;
10391039
if(elapsed > timeout || !Monitor.Wait(
1040-
m_unconfirmedSet.SyncRoot, timeout - elapsed))
1040+
m_unconfirmedSet.SyncRoot, timeout - elapsed))
10411041
{
10421042
timedOut = true;
10431043
return true;
@@ -1129,7 +1129,7 @@ public string BasicConsume(string queue,
11291129
// Non-nowait. We have an unconventional means of getting
11301130
// the RPC response, but a response is still expected.
11311131
_Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,
1132-
/*nowait:*/ false, arguments);
1132+
/*nowait:*/ false, arguments);
11331133
k.GetReply();
11341134
string actualConsumerTag = k.m_consumerTag;
11351135

@@ -1177,10 +1177,10 @@ public void HandleBasicCancelOk(string consumerTag)
11771177
(BasicConsumerRpcContinuation)m_continuationQueue.Next();
11781178

11791179
Trace.Assert(k.m_consumerTag == consumerTag, string.Format(
1180-
"Consumer tag mismatch during cancel: {0} != {1}",
1181-
k.m_consumerTag,
1182-
consumerTag
1183-
));
1180+
"Consumer tag mismatch during cancel: {0} != {1}",
1181+
k.m_consumerTag,
1182+
consumerTag
1183+
));
11841184

11851185
lock (m_consumers)
11861186
{
@@ -1290,14 +1290,14 @@ public void BasicPublish(string exchange,
12901290
basicProperties = CreateBasicProperties();
12911291
}
12921292
if (m_nextPubSeqNo > 0) {
1293-
lock(m_unconfirmedSet.SyncRoot)
1294-
{
1295-
if(!m_unconfirmedSet.Contains(m_nextPubSeqNo))
1296-
{
1297-
m_unconfirmedSet.Add(m_nextPubSeqNo);
1298-
}
1293+
lock(m_unconfirmedSet.SyncRoot)
1294+
{
1295+
if(!m_unconfirmedSet.Contains(m_nextPubSeqNo))
1296+
{
1297+
m_unconfirmedSet.Add(m_nextPubSeqNo);
1298+
}
12991299
m_nextPubSeqNo++;
1300-
}
1300+
}
13011301
}
13021302
_Private_BasicPublish(exchange,
13031303
routingKey,
@@ -1337,12 +1337,12 @@ void IDisposable.Dispose()
13371337

13381338
public void Close()
13391339
{
1340-
Close(CommonFraming.Constants.ReplySuccess, "Goodbye");
1340+
Close(CommonFraming.Constants.ReplySuccess, "Goodbye");
13411341
}
13421342

13431343
public void Close(ushort replyCode, string replyText)
13441344
{
1345-
Close(replyCode, replyText, false);
1345+
Close(replyCode, replyText, false);
13461346
}
13471347

13481348
public void Abort()
@@ -1375,10 +1375,10 @@ public void Close(ShutdownEventArgs reason, bool abort)
13751375
k.Wait();
13761376
} catch (AlreadyClosedException ace) {
13771377
if (!abort)
1378-
throw ace;
1378+
throw ace;
13791379
} catch (IOException ioe) {
13801380
if (!abort)
1381-
throw ioe;
1381+
throw ioe;
13821382
}
13831383
}
13841384

0 commit comments

Comments
 (0)