svn commit: r930179 - in /camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring: CamelContextFactoryBean.java SpringCamelContext.java

[ningjiang]

Author: ningjiang
Date: Fri Apr  2 07:33:29 2010
New Revision: 930179

URL: http://svn.apache.org/viewvc?rev=930179&view=rev
Log:
 CAMEL-2607 Fixed the application event fire twice issue with Spring 3.0.1

Modified:
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=930179&r1=930178&r2=930179&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 Fri Apr  2 07:33:29 2010
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -636,6 +637,10 @@ public class CamelContextFactoryBean ext
     }
 
     public void onApplicationEvent(ApplicationEvent event) {
+        // From Spring 3.0.1, The BeanFactory applicationEventListener 
+        // and Bean's applicationEventListener will be called,
+        // So we just delegate the onApplicationEvent call here.
+        
         if (context != null) {
             // let the spring camel context handle the events
             context.onApplicationEvent(event);

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=930179&r1=930178&r2=930179&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
 Fri Apr  2 07:33:29 2010
@@ -53,7 +53,7 @@ import static org.apache.camel.util.Obje
  * @version $Revision$
  */
 public class SpringCamelContext extends DefaultCamelContext implements 
InitializingBean, DisposableBean,
-        ApplicationContextAware, ApplicationListener {
+        ApplicationContextAware {
 
     private static final transient Log LOG = 
LogFactory.getLog(SpringCamelContext.class);
     private ApplicationContext applicationContext;