Resolve issue #268

Co-Authored-By: Steven Bone <[email protected]>

Author: darkl

src/net45/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/Async/OperationResultExtractor.cs

@@ -51,11 +51,11 @@ private static ArgumentUnpacker GetTupleArgumentUnpacker(MethodInfo method)
 
             IEnumerable<string> transformNames = null;
 
-            if (method.ReturnParameter.IsDefined(typeof(TupleElementNamesAttribute)))
-            {
-                TupleElementNamesAttribute attribute =
-                    method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
+            TupleElementNamesAttribute attribute =
+                method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
 
+            if (attribute != null)
+            {
                 transformNames = attribute.TransformNames;
             }
 

src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/MethodInfoValidation.cs

@@ -23,13 +23,13 @@ public static void ValidateTupleReturnType(MethodInfo method)
                     ThrowHelper.MethodReturnsInvalidValueTuple(method);
                 }
 
-                if (method.ReturnParameter.IsDefined(typeof(TupleElementNamesAttribute)))
+                TupleElementNamesAttribute attribute =
+                    method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
+
+                if (attribute != null)
                 {
                     int tupleLength = tupleType.GetValueTupleLength();
 
-                    TupleElementNamesAttribute attribute = 
-                        method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
-
                     IList<string> transformNames = attribute.TransformNames;
 
                     List<string> tupleNames = 
@@ -123,19 +123,19 @@ public static void ValidateProgressiveMethod(MethodInfo method)
 
         private static void ValidateTupleReturnTypeOfProgressiveMethod(MethodInfo method, ParameterInfo lastParameter)
         {
-            bool methodHasAttribute = method.ReturnParameter.IsDefined(typeof(TupleElementNamesAttribute));
-            bool parameterHasAttributte = lastParameter.IsDefined(typeof(TupleElementNamesAttribute));
+            TupleElementNamesAttribute methodAttribute =
+                method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
+
+            TupleElementNamesAttribute parameterAttribute =
+                lastParameter.GetCustomAttribute<TupleElementNamesAttribute>();
+
+            bool methodHasAttribute = methodAttribute != null;
+            bool parameterHasAttributte = parameterAttribute != null;
 
             bool attributesMatch = methodHasAttribute == parameterHasAttributte;
 
             if (methodHasAttribute && parameterHasAttributte)
             {
-                TupleElementNamesAttribute methodAttribute =
-                    method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
-
-                TupleElementNamesAttribute parameterAttribute =
-                    lastParameter.GetCustomAttribute<TupleElementNamesAttribute>();
-
                 IList<string> methodTransformNames = methodAttribute.TransformNames;
                 IList<string> parameterTransformNames = parameterAttribute.TransformNames;
 

src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/ResultExtractor/WampResultExtractor.cs

@@ -47,11 +47,11 @@ public static IWampResultExtractor GetValueTupleResultExtractor(MethodInfo metho
 
             IWampResultExtractor result = new PositionalTupleExtractor(tupleType);
 
-            if (method.ReturnParameter.IsDefined(typeof(TupleElementNamesAttribute)))
-            {
-                TupleElementNamesAttribute attribute =
-                    method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
+            TupleElementNamesAttribute attribute =
+                method.ReturnParameter.GetCustomAttribute<TupleElementNamesAttribute>();
 
+            if (attribute != null)
+            {
                 int valueTupleLength = tupleType.GetValueTupleLength();
 
                 // If the tuple is named, return a named tuple extractor