Skip to content

Commit a291239

Browse files
committed
Fix serialization issues exposed by enabling InMemoryConnection to serialize PostData
1 parent 4a987c4 commit a291239

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/Elasticsearch.Net/Connection/InMemoryConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected ElasticsearchResponse<TReturn> ReturnConnectionStatus<TReturn>(Request
4949
var builder = new ResponseBuilder<TReturn>(requestData)
5050
{
5151
StatusCode = statusCode ?? this._statusCode,
52-
Stream = (body != null) ? new MemoryStream(body) : null,
52+
Stream = (body != null) ? new MemoryStream(body) : null
5353
};
5454
var cs = builder.ToResponse();
5555
return cs;

src/Elasticsearch.Net/Transport/PostData.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void Write(Stream writableStream, IConnectionConfigurationValues settings
4545
case PostType.ByteArray:
4646
ms = new MemoryStream(WrittenBytes);
4747
break;
48-
case PostType.LiteralString:
49-
ms = new MemoryStream(_literalString?.Utf8Bytes());
48+
case PostType.LiteralString:
49+
ms = !string.IsNullOrEmpty(_literalString) ? new MemoryStream(_literalString?.Utf8Bytes()) : null;
5050
break;
5151
case PostType.EnumerableOfString:
5252
ms = _enumurabeOfStrings.HasAny() ? new MemoryStream((string.Join("\n", _enumurabeOfStrings) + "\n").Utf8Bytes()) : null;

src/Nest/Search/Percolator/MultiPercolate/MultiPercolateJsonConverter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
1414
{
1515
var request = value as IMultiPercolateRequest;
1616
if (request == null) return;
17+
if (request.Percolations == null) return;
1718

1819
var settings = serializer.GetConnectionSettings();
1920
var elasticsearchSerializer = settings.Serializer;

src/Tests/ClientConcepts/LowLevel/PostData.doc.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ [U] public void ImplicitConversions()
5858
fromListOfObject.Type.Should().Be(PostType.EnumerableOfObject);
5959
fromObject.Type.Should().Be(PostType.Serializable);
6060

61-
//passing a PostData<obkect> object to a method taking PostData<object> should not wrap
61+
//passing a PostData<object> object to a method taking PostData<object> should not wrap
6262

6363
fromString = ImplicitlyConvertsFrom(fromString);
6464
fromByteArray = ImplicitlyConvertsFrom(fromByteArray);

0 commit comments

Comments
 (0)