Skip to content

Fix for NPE when creating ProtobufHttpMessageConverter without ExtensionRegistryInitializer #702

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
bclozel merged 1 commit into from
Dec 3, 2014
+10 −1
Merged

Fix for NPE when creating ProtobufHttpMessageConverter without ExtensionRegistryInitializer #702

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...c/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public ProtobufHttpMessageConverter() {
*/
public ProtobufHttpMessageConverter(ExtensionRegistryInitializer registryInitializer) {
super(PROTOBUF, MediaType.TEXT_PLAIN, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON);
if (this.extensionRegistry != null) {
if (registryInitializer != null) {
registryInitializer.initializeExtensionRegistry(this.extensionRegistry);
}
}
Expand Down
9 changes: 9 additions & 0 deletions ...t/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ public void extensionRegistryInitialized() {
verify(this.registryInitializer, times(1)).initializeExtensionRegistry(anyObject());
}

@Test
public void extensionRegistryNull() {
try {
new ProtobufHttpMessageConverter(null);
} catch (Exception e) {
fail("Unable to create ProtobufHttpMessageConverter with null extensionRegistry");
}
}

@Test
public void canRead() {
assertTrue(this.converter.canRead(Msg.class, null));
Expand Down