Rest API location transformers use mutable map #99
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LocationConfig contains null values which Guava's ImmutableMap rejects with a NullPointerException
|
Test failure unrelated. Filed at https://issues.apache.org/jira/browse/BROOKLYN-247. Trying again. |
| @@ -53,7 +54,7 @@ public LocationSpec( | |||
| @JsonProperty("config") @Nullable Map<String, ?> config) { | |||
| this.name = name; | |||
| this.spec = spec; | |||
| this.config = (config == null) ? Collections.<String, String> emptyMap() : ImmutableMap.copyOf(config); | |||
| this.config = (config == null) ? Collections.<String, String> emptyMap() : MutableMap.copyOf(config); | |||
There was a problem hiding this comment.
(minor) could add asUnmodifiable or asImmutableCopy to keep the immutability.
|
Looks good, will wait for the build to complete and merge. |
asfgit
pushed a commit
that referenced
this pull request
Apr 6, 2016
Rest API location transformers use mutable map LocationConfig contains null values which Guava's ImmutableMap rejects with a NullPointerException. This fixes an error observed when deploying the "Template 1: Server" sample to localhost then running `br application <id>` with the CLI. The output from the CLI was "500 Server Error". The server logs contained: ``` java.lang.NullPointerException: null value in entry: byon.machineSpecs=null at com.google.common.collect.CollectPreconditions.checkEntryNotNull(CollectPreconditions.java:33) ~[com.google.guava-guava-16.0.1.jar:na] at com.google.common.collect.ImmutableMap.entryOf(ImmutableMap.java:135) ~[com.google.guava-guava-16.0.1.jar:na] at com.google.common.collect.ImmutableMap$Builder.put(ImmutableMap.java:206) ~[com.google.guava-guava-16.0.1.jar:na] at org.apache.brooklyn.rest.transform.LocationTransformer.copyConfig(LocationTransformer.java:128) ~[org.apache.brooklyn-brooklyn-rest-resources-0.10.0-SNAPSHOT.jar:0.10.0-SNAPSHOT] at org.apache.brooklyn.rest.transform.LocationTransformer.newInstance(LocationTransformer.java:189) ~[org.apache.brooklyn-brooklyn-rest-resources-0.10.0-SNAPSHOT.jar:0.10.0-SNAPSHOT] at org.apache.brooklyn.rest.resources.LocationResource.get(LocationResource.java:139) ~[org.apache.brooklyn-brooklyn-rest-resources-0.10.0-SNAPSHOT.jar:0.10.0-SNAPSHOT] at org.apache.brooklyn.rest.resources.LocationResource.get(LocationResource.java:132) ~[org.apache.brooklyn-brooklyn-rest-resources-0.10.0-SNAPSHOT.jar:0.10.0-SNAPSHOT] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_05] ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LocationConfig contains null values which Guava's ImmutableMap rejects with a NullPointerException.
This fixes an error observed when deploying the "Template 1: Server" sample to localhost then running
br application <id>with the CLI. The output from the CLI was "500 Server Error". The server logs contained: