Fixed a recursion problem in the encryption mutator when system.datetime

was used as a property.

Related to #469

Author: andreasohlund

src/encryption/NServiceBus.Encryption/EncryptionMessageMutator.cs

@@ -35,7 +35,7 @@ void EncryptObject(object target)
                     continue;
                 }
 
-                if (property.PropertyType.IsPrimitive)
+                if (property.PropertyType.IsPrimitive || IsSystemType(property.PropertyType))
                     continue;
 
                 //recurse
@@ -94,14 +94,21 @@ void DecryptObject(object target)
                     continue;
                 }
 
-                if (property.PropertyType.IsPrimitive)
+                if (property.PropertyType.IsPrimitive || IsSystemType(property.PropertyType))
                     continue;
 
                 //recurse
                 DecryptObject(property.GetValue(target, null));
             }
         }
 
+        bool IsSystemType(Type propertyType)
+        {
+            var nameOfContainingAssembly = propertyType.Assembly.FullName.ToLower();
+
+            return nameOfContainingAssembly.StartsWith("mscorlib") || nameOfContainingAssembly.StartsWith("system.core");
+        }
+
         void DecryptProperty(object target, PropertyInfo property)
         {
 

tests/encryption/NServiceBus.Encryption.Tests/WireEncryptedStringSpecs.cs

@@ -153,6 +153,8 @@ public class SecureMessage:IMessage
         public MySecretSubProperty SubProperty { get; set; }
 
         public WireEncryptedString SecretThatIsNull { get; set; }
+
+        public DateTime DateTime { get; set; }
     }