Merge pull request dotnet#318 from StephenBonikowsky/Issue315

Fix for Issue dotnet#315
sll97163 · Sep 18, 2015 · b93b9d4 · b93b9d4
2 parents 81e95be + cf4aea9
commit b93b9d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Description/ServiceReflector.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Description/ServiceReflector.cs
@@ -457,7 +457,17 @@ static internal object[] GetCustomAttributes(CustomAttributeProvider attrProvide
                 }
                 else
                 {
-                    return Array.Empty<object>();
+                    List<object> attrTypeAttributes = new List<object>();
+                    object[] allCustomAttributes = attrProvider.GetCustomAttributes(inherit);
+                    foreach (object customAttribute in allCustomAttributes)
+                    {
+                        if (attrType.IsAssignableFrom(customAttribute.GetType()))
+                        {
+                            attrTypeAttributes.Add(customAttribute);
+                        }
+                    }
+
+                    return attrTypeAttributes.ToArray();
                 }
             }
             catch (Exception e)

diff --git a/src/System.ServiceModel.Primitives/tests/Description/OperationBehaviorTest.cs b/src/System.ServiceModel.Primitives/tests/Description/OperationBehaviorTest.cs
@@ -8,7 +8,6 @@
 public static class OperationBehaviorTest
 {
     [Fact]
-    [ActiveIssue(315)]
     public static void IOperationBehavior_Methods_AreCalled()
     {
         DuplexClientBase<ICustomOperationBehaviorDuplexService> duplexService = null;