diff --git a/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java b/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
index ec76eb833..e8780376e 100644
--- a/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
+++ b/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
@@ -124,7 +124,7 @@ public class BeanDefinitionUtils {
 		BeanDefinition definition = beanFactory.getBeanDefinition(name);
 
 		if (JNDI_OBJECT_FACTORY_BEAN.equals(definition.getBeanClassName())) {
-			if (!definition.getPropertyValues().get("expectedType").equals(EntityManagerFactory.class.getName())) {
+			if (!EntityManagerFactory.class.getName().equals(definition.getPropertyValues().get("expectedType"))) {
 				return;
 			}
 		}
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java
index e1b8da124..8098145bd 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java
@@ -133,6 +133,7 @@ public class DefaultJpaContextIntegrationTests {
 
 		SimpleNamingContextBuilder builder = SimpleNamingContextBuilder.emptyActivatedContextBuilder();
 		builder.bind("some/EMF", createEntityManagerFactory("spring-data-jpa"));
+		builder.bind("some/other/Component", new Object());
 
 		ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("config/jpa-context-with-jndi.xml");
 		ApplicationComponent component = context.getBean(ApplicationComponent.class);
diff --git a/src/test/resources/config/jpa-context-with-jndi.xml b/src/test/resources/config/jpa-context-with-jndi.xml
index 70be5f779..74d6ed048 100644
--- a/src/test/resources/config/jpa-context-with-jndi.xml
+++ b/src/test/resources/config/jpa-context-with-jndi.xml
@@ -14,7 +14,10 @@
 	<jee:jndi-lookup id="entityManagerFactory" 
 		jndi-name="some/EMF" 
 		expected-type="javax.persistence.EntityManagerFactory" />
-	
+
+	<jee:jndi-lookup id="someOtherJndiBean"
+		jndi-name="some/other/Component" />
+
 	<bean class="org.springframework.data.jpa.repository.support.DefaultJpaContextIntegrationTests$ApplicationComponent" autowire="constructor" />
 
 </beans>