root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #702 from aantono/master 

Fix for NPE when creating ProtobufHttpMessageConverter without ExtensionRegistryInitializer
This commit is contained in:
Brian Clozel 2014-12-03 21:01:34 +01:00
parent d322bcfbf4 b041cffe5d
commit 1de71511f0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
View File

@ -86,7 +86,7 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
*/
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);
}
}

9
spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
View File

@ -58,6 +58,15 @@ public class ProtobufHttpMessageConverterTests {
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));