From 7e98470f8acd69fa885286ccd6efd5769bad1754 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 6 Mar 2014 16:28:03 +0100
Subject: Type was being overridden with 'domain' if the CompositeActivity name
 was 'domain'. Stop this to let the type name be the CompositeActivityDef
 name.

---
 src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
index f9ab0fe..016298f 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -397,8 +397,6 @@ public class CompositeActivity extends Activity
     @Override
 	public String getType()
     {
-        if (getName().equals("domain"))
-            return "domain";
         return super.getType();
     }
 
-- 
cgit v1.2.3