1 files changed, 5 insertions, 1 deletions
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index c213d9f8d2..af46ee5fc6 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
@@ -377,7 +377,11 @@ public class CompositeActivatorImpl implements CompositeActivator {
                                                     wireProcessor,
                                                     messageFactory);
 
-            runtimeService.getRuntimeWires().add(wire);
+            // TODO - EPR - TUSCANY-3187 - keep and eye on this as to code
+            //      has been reported to be working without this fix in some 
+            //      environments
+            //runtimeService.getRuntimeWires().add(wire);
+            ((RuntimeComponentService)endpoint.getService()).getRuntimeWires().add(wire);
         }
     }