Made SiloAssemblyLoader recognize concrete state classes passed as ty…

…pe arguments to Grain<T> in addition to finding codegen'ed state classes.
dotnet · Jun 2, 2015 · a9128de · a9128de
1 parent 9a62b20
commit a9128de
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/src/OrleansRuntime/GrainTypeManager/SiloAssemblyLoader.cs b/src/OrleansRuntime/GrainTypeManager/SiloAssemblyLoader.cs
@@ -89,6 +89,30 @@ public IDictionary<string, GrainTypeData> GetGrainClassTypes(bool strict)
                 var parameterizedName = grainType.Namespace + "." + TypeUtils.GetParameterizedTemplateName(grainType);
                 Type grainStateType;
                 grainStateTypes.TryGetValue(parameterizedName, out grainStateType);
+
+                if (grainStateType == null) // check if grainType derives from Grain<T> where T is a concrete class
+                {
+                    var parentType = grainType.BaseType;
+                    while (parentType != typeof (Grain) && parentType != typeof(object))
+                    {
+                        if (parentType.IsGenericType)
+                        {
+                            var definition = parentType.GetGenericTypeDefinition();
+                            if (definition == typeof (Grain<>))
+                            {
+                                var stateArg = parentType.GetGenericArguments()[0];
+                                if (stateArg.IsClass)
+                                {
+                                    grainStateType = stateArg;
+                                    break;
+                                }
+                            }
+                        }
+
+                        parentType = parentType.BaseType;
+                    }
+                }
+
                 GrainTypeData typeData = GetTypeData(grainType, grainStateType);
                 result.Add(className, typeData);
             }