From 8c481b6a212e2acee61fbb9289de737d85866a2d Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Thu, 16 Apr 2015 13:45:57 +0100
Subject: [PATCH] Fix bean conflict with spring-security

- In ObjectPostProcessorConfiguration change post prosessor
  bean name not to be same as in spring security.
- Fixes #37
---
 .../configuration/ObjectPostProcessorConfiguration.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java
index 20a88a39..44648a70 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java
@@ -34,7 +34,9 @@ import org.springframework.statemachine.config.common.annotation.ObjectPostProce
 @Configuration
 public class ObjectPostProcessorConfiguration {
 
-	@Bean
+	private final static String POST_PROCESSOR_BEAN_ID = "org.springframework.statemachine.config.common.annotation.configuration.objectPostProcessor";
+
+	@Bean(name = POST_PROCESSOR_BEAN_ID)
 	public ObjectPostProcessor<Object> objectPostProcessor(AutowireCapableBeanFactory beanFactory) {
 		return new AutowireBeanFactoryObjectPostProcessor(beanFactory);
 	}