Merge branch 'develop' of github.com:framework-one/fw1 into develop

framework-one · Jul 8, 2015 · e8a62ef · e8a62ef
2 parents 5f58758 + 1f27912
commit e8a62ef
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/framework/beanProxy.cfc b/framework/beanProxy.cfc
@@ -375,7 +375,10 @@ component {
 		}
 
 
-		augmentInterceptor(arguments.interceptor);
+		if (!structKeyExists(arguments.interceptor.bean, "interceptorAugmented"))
+		{
+			augmentInterceptor(arguments.interceptor);
+		}
 
 
 		// Maintain the list of intercepted methods. '*' and blank means all.
@@ -433,6 +436,7 @@ component {
 
 		arguments.interceptor.bean._inject = _inject;
 
+		arguments.interceptor.bean._inject("interceptorAugmented", true);
 		arguments.interceptor.bean._inject("interceptedMethods", arguments.interceptor.methods, "private");
 		arguments.interceptor.bean._inject("translateArgs", _translateArgs, "private");