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) {