From 003a44ee832ea832dcac5e052fcdff02c8f5b0cd Mon Sep 17 00:00:00 2001
From: Johan Rask <johan.rask@jayway.com>
Date: Tue, 6 Jul 2010 13:07:25 +0200
Subject: [PATCH] Minor change, overriding destroyInstance instead of destroy

---
 .../src/main/scala/ActiveObjectFactoryBean.scala      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala b/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala
index 5b7a62a0b5..03f0f50df3 100644
--- a/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala
+++ b/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala
@@ -85,15 +85,12 @@ class ActiveObjectFactoryBean extends AbstractFactoryBean[AnyRef] with Logging w
     setProperties(create(argumentList))
   }
 
-  /**
+ /**
    * Stop the active object if it is a singleton.
    */
-  override def destroy = {
-    if(scope.equals(VAL_SCOPE_SINGLETON)) {
-      ActiveObject.stop(getObject)
-    }
-    super.destroy
-  }
+ override def destroyInstance(instance:AnyRef) {
+	ActiveObject.stop(instance)
+ }
 
    private def setProperties(ref:AnyRef) : AnyRef = {
         if(hasSetDependecies) {