From b041cffe5d0cf44a15ac554d82b680ba8b67d415 Mon Sep 17 00:00:00 2001
From: Alex Antonov <alex@antonov.ws>
Date: Wed, 3 Dec 2014 12:26:18 -0600
Subject: [PATCH] Fix for NPE when creating ProtobufHttpMessageConverter
 without ExtensionRegistryInitializer

---
 .../converter/protobuf/ProtobufHttpMessageConverter.java | 2 +-
 .../protobuf/ProtobufHttpMessageConverterTests.java      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
index b8c3d16b88..54d3591333 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
@@ -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);
 		}
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
index a80490f1ad..d15ab171c1 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
@@ -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));