1 files changed, 6 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
index 6b99b77802..994783b928 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
@@ -191,10 +191,12 @@ public class DomainRegistryImpl extends BaseDomainRegistry implements DomainRegi
     public Map<String, List<QName>> getRunningCompositeNames() {
        Map<String, List<QName>> compositeNames = new HashMap<String, List<QName>>();
        for (String curi : runningComposites.keySet()) {
-           List<QName> names = new ArrayList<QName>();
-           compositeNames.put(curi, names);
-           for (QName qn : runningComposites.get(curi).keySet()) {
-               names.add(qn);
+           if (runningComposites.get(curi).size() > 0) {
+               List<QName> names = new ArrayList<QName>();
+               compositeNames.put(curi, names);
+               for (QName qn : runningComposites.get(curi).keySet()) {
+                   names.add(qn);
+               }
            }
        }
         return compositeNames;