From f30d35bb8d6ccac38e4aa1b3c9fc2ea1ff5f0081 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 24 Jul 2009 17:49:04 +0000
Subject: Add a test to avoid expensive reset of the CompositeActivator

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@797578 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/sca/modules/core')

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
index 705934e557..cc3bbc1f6e 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
@@ -428,12 +428,12 @@ public class CallableReferenceImpl<B> implements ServiceReferenceExt<B> {
             }            
 
             this.proxyFactory = compositeActivator.getCompositeContext().getProxyFactory();       
-        } else {
+        } else if (compositeActivator == null) {
             this.compositeActivator = CompositeContext.getCurrentCompositeActivator();
             if (this.compositeActivator != null) {
                 this.proxyFactory = this.compositeActivator.getCompositeContext().getProxyFactory();
             }
-        }        
+        }       
     }
     
     // ==================================================================================
-- 
cgit v1.2.3