https://issues.apache.org/jira/browse/AMQNET-444
https://issues.apache.org/jira/browse/AMQNET-443
diff --git a/src/main/csharp/OpenWire/V1/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
index 737084c..c2c61dc 100644
--- a/src/main/csharp/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs
index 389d079..1bedc75 100644
--- a/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V3/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V3/NetworkBridgeFilterMarshaller.cs
index 0561472..5b3b3e5 100644
--- a/src/main/csharp/OpenWire/V3/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V3/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V4/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V4/NetworkBridgeFilterMarshaller.cs
index 21743a3..be84a87 100644
--- a/src/main/csharp/OpenWire/V4/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V4/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V5/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V5/NetworkBridgeFilterMarshaller.cs
index aa9e432..57f0711 100644
--- a/src/main/csharp/OpenWire/V5/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V5/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V6/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V6/NetworkBridgeFilterMarshaller.cs
index 2bc9a3f..db7fe22 100644
--- a/src/main/csharp/OpenWire/V6/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V6/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V7/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V7/NetworkBridgeFilterMarshaller.cs
index 7e6358a..47b75d6 100644
--- a/src/main/csharp/OpenWire/V7/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V7/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V8/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V8/NetworkBridgeFilterMarshaller.cs
index 535966c..6eebc09 100644
--- a/src/main/csharp/OpenWire/V8/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V8/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}
diff --git a/src/main/csharp/OpenWire/V9/NetworkBridgeFilterMarshaller.cs b/src/main/csharp/OpenWire/V9/NetworkBridgeFilterMarshaller.cs
index 2361d0f..dd5e650 100644
--- a/src/main/csharp/OpenWire/V9/NetworkBridgeFilterMarshaller.cs
+++ b/src/main/csharp/OpenWire/V9/NetworkBridgeFilterMarshaller.cs
@@ -61,7 +61,6 @@
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
@@ -75,7 +74,7 @@
int rc = base.TightMarshal1(wireFormat, o, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
- return rc + 4;
+ return rc + 0;
}
//
@@ -86,7 +85,6 @@
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
@@ -98,7 +96,6 @@
base.LooseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
- info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
}
@@ -111,7 +108,6 @@
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
base.LooseMarshal(wireFormat, o, dataOut);
- dataOut.Write(info.NetworkTTL);
LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
}
}