Merge pull request #702 from aantono/master

Fix for NPE when creating ProtobufHttpMessageConverter without ExtensionRegistryInitializer

Author: bclozel

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

@@ -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);
 		}
 	}

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

@@ -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));