Skip to content
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.

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

Jump to bottom

Fix potential NPE when no source and no body #4924

Closed
dadoonet opened this issue Jan 28, 2014 · 0 comments
Closed

Fix potential NPE when no source and no body #4924

dadoonet opened this issue Jan 28, 2014 · 0 comments
Assignees
@dadoonet
Labels
>bug v0.90.11 v1.0.0.RC2 v1.1.0 v2.0.0-beta1

Comments

@dadoonet
Copy link
Member

In recent changes, we added missing support for source parameter in some REST APIs:

        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }

It's definitely better to have:

        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }

That said, it could be nice to have a single method to manage it for various REST actions.
Where should we put it in?
@ghost ghost assigned dadoonet Jan 28, 2014
dadoonet added a commit to dadoonet/elasticsearch that referenced this issue Jan 28, 2014
@dadoonet
Fix potential NPE when no source and no body
94f5780 
In recent changes, we added missing support for `source` parameter in some REST APIs:

* elastic#4892 : mget
* elastic#4900 : mpercolate
* elastic#4901 : msearch
* elastic#4902 : mtermvectors
* elastic#4903 : percolate

```java
        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

It's definitely better to have:

```java
        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

That said, it could be nice to have a single method to manage it for various REST actions.

Closes elastic#4924.
@dadoonet dadoonet mentioned this issue Jan 28, 2014
Closed
dadoonet added a commit that referenced this issue Jan 28, 2014
@dadoonet
Fix potential NPE when no source and no body
83ba2f6 
In recent changes, we added missing support for `source` parameter in some REST APIs:

* #4892 : mget
* #4900 : mpercolate
* #4901 : msearch
* #4902 : mtermvectors
* #4903 : percolate

```java
        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

It's definitely better to have:

```java
        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

That said, it could be nice to have a single method to manage it for various REST actions.

Closes #4924.
dadoonet added a commit that referenced this issue Jan 28, 2014
@dadoonet
Fix potential NPE when no source and no body
4e1a947 
In recent changes, we added missing support for `source` parameter in some REST APIs:

* #4892 : mget
* #4900 : mpercolate
* #4901 : msearch
* #4902 : mtermvectors
* #4903 : percolate

```java
        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

It's definitely better to have:

```java
        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

That said, it could be nice to have a single method to manage it for various REST actions.

Closes #4924.
dadoonet added a commit that referenced this issue Jan 28, 2014
@dadoonet
Fix potential NPE when no source and no body
088968d 
In recent changes, we added missing support for `source` parameter in some REST APIs:

* #4892 : mget
* #4900 : mpercolate
* #4901 : msearch
* #4902 : mtermvectors
* #4903 : percolate

```java
        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

It's definitely better to have:

```java
        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

That said, it could be nice to have a single method to manage it for various REST actions.

Closes #4924.
mute pushed a commit to mute/elasticsearch that referenced this issue Jul 29, 2015
@dadoonet
Fix potential NPE when no source and no body
d3c3264 
In recent changes, we added missing support for `source` parameter in some REST APIs:

* elastic#4892 : mget
* elastic#4900 : mpercolate
* elastic#4901 : msearch
* elastic#4902 : mtermvectors
* elastic#4903 : percolate

```java
        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

It's definitely better to have:

```java
        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

That said, it could be nice to have a single method to manage it for various REST actions.

Closes elastic#4924.
mute pushed a commit to mute/elasticsearch that referenced this issue Jul 29, 2015
@dadoonet
Fix potential NPE when no source and no body
3ff204d 
In recent changes, we added missing support for `source` parameter in some REST APIs:

* elastic#4892 : mget
* elastic#4900 : mpercolate
* elastic#4901 : msearch
* elastic#4902 : mtermvectors
* elastic#4903 : percolate

```java
        BytesReference content = null;
        if (request.hasContent()) {
            content = request.content();
        } else {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

It's definitely better to have:

```java
        BytesReference content = request.content();
        if (!request.hasContent()) {
            String source = request.param("source");
            if (source != null) {
                content = new BytesArray(source);
            }
        }
```

That said, it could be nice to have a single method to manage it for various REST actions.

Closes elastic#4924.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@dadoonet dadoonet

Labels
>bug v0.90.11 v1.0.0.RC2 v1.1.0 v2.0.0-beta1
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix potential NPE when no source and no body dadoonet/elasticsearch
1 participant
@dadoonet