Skip to content

Check stream is seekable when checking length #3291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2018
+4 −4
Merged

Check stream is seekable when checking length #3291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Nest/CommonAbstractions/SerializationBehavior/InternalSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ public Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting for

public T Deserialize<T>(Stream stream)
{
if (stream == null || stream.Length == 0) return default(T);
if (stream == null || stream.CanSeek && stream.Length == 0) return default(T);
using (var streamReader = new StreamReader(stream))
using (var jsonTextReader = new JsonTextReader(streamReader))
return this.Serializer.Deserialize<T>(jsonTextReader);
}

public object Deserialize(Type type, Stream stream)
{
if (stream == null || stream.Length == 0) return type.DefaultValue();
if (stream == null || stream.CanSeek && stream.Length == 0) return type.DefaultValue();
using (var streamReader = new StreamReader(stream))
using (var jsonTextReader = new JsonTextReader(streamReader))
return this.Serializer.Deserialize(jsonTextReader, type);
Expand All @@ -103,7 +103,7 @@ public object Deserialize(Type type, Stream stream)
public async Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
#pragma warning restore 1998
{
if (stream == null || stream.Length == 0) return default(T);
if (stream == null || stream.CanSeek && stream.Length == 0) return default(T);
using (var sr = new StreamReader(stream))
using (var jtr = new JsonTextReader(sr))
return this.Serializer.Deserialize<T>(jtr);
Expand All @@ -113,7 +113,7 @@ public object Deserialize(Type type, Stream stream)
public async Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default(CancellationToken))
#pragma warning restore 1998
{
if (stream == null || stream.Length == 0) return type.DefaultValue();
if (stream == null || stream.CanSeek && stream.Length == 0) return type.DefaultValue();
using (var sr = new StreamReader(stream))
using (var jtr = new JsonTextReader(sr))
return this.Serializer.Deserialize(jtr, type);
Expand Down