Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Common/3.3

Timestamp:

12/20/11 13:54:57 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (2 diffs)

branches/HeuristicLab.Hive.Azure

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

branches/HeuristicLab.Hive.Azure/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -26 +26 @@
 using System.Linq;
 using System.Reflection;
+using System.Security;
 using System.Threading;
 
@@ -95 +96 @@
         foreach (FieldInfo f in type.GetAllFields()) {
           if (excludeStaticMembers && f.IsStatic) continue;
-          yield return f.GetValue(obj);
+          object fieldValue;
+          try {
+            fieldValue = f.GetValue(obj);
+          } catch (SecurityException) {
+            continue;
+          }
+          yield return fieldValue;
         }
       }

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen