Skip to content

Commit 7596a9f

Browse files
author
Emile Joubert
committed
Don't decide whether to support redirect by inspecting XML spec
1 parent adf987b commit 7596a9f

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ public static string MangleMethodClass(AmqpClass c, AmqpMethod m) {
185185
public int m_revision = 0;
186186
public string m_apiName;
187187
public bool m_emitComments = false;
188-
public bool m_supportsRedirect;
189188

190189
public Type m_modelType = typeof(RabbitMQ.Client.Impl.IFullModel);
191190
public ArrayList m_modelTypes = new ArrayList();
@@ -313,10 +312,7 @@ public void ParseSpec() {
313312
}
314313
foreach (XmlNode n in m_spec.SelectNodes("/amqp/domain")) {
315314
m_domains[GetString(n, "@name")] = GetString(n, "@type");
316-
}
317-
m_supportsRedirect =
318-
m_spec.SelectSingleNode(
319-
"/amqp/class[@name='connection']/method[@name='redirect']") != null;
315+
}
320316
}
321317

322318
public void ReflectModel() {
@@ -449,9 +445,6 @@ public void EmitPublic() {
449445
int port = GetInt(m_spec, "/amqp/@port");
450446
EmitLine(" ///<summary>Default TCP port (= "+port+")</summary>");
451447
EmitLine(" public override int DefaultPort { get { return " + port + "; } }");
452-
EmitLine(" ///<summary>Whether redirect is supported</summary>");
453-
EmitLine(" public override bool SupportsRedirect { get { return "
454-
+ m_supportsRedirect.ToString().ToLower() + "; } }");
455448
EmitLine("");
456449
EmitMethodArgumentReader();
457450
EmitLine("");

projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ public abstract class AbstractProtocolBase: IProtocol {
6565
public abstract int Revision { get; }
6666
public abstract string ApiName { get; }
6767
public abstract int DefaultPort { get; }
68-
public abstract bool SupportsRedirect { get; }
68+
public virtual bool SupportsRedirect
69+
{
70+
get { return true; }
71+
}
6972

7073
public abstract IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint);
7174
public abstract IConnection CreateConnection(ConnectionFactory factory,

projects/client/RabbitMQ.Client/src/client/impl/v0_9_1/ProtocolBase.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@
6161
namespace RabbitMQ.Client.Framing.Impl.v0_9_1 {
6262
public abstract class ProtocolBase: AbstractProtocolBase {
6363

64+
public override bool SupportsRedirect
65+
{
66+
get { return false; }
67+
}
68+
6469
public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) {
6570
return new SocketFrameHandler_0_9(endpoint);
6671
}

0 commit comments

Comments
 (0)