Memory leaks in AttributeHelper fixed

Interface for geoemtry created extended to allow positioning of objects
xBimTeam · Jul 23, 2015 · 10aa6f1 · 10aa6f1
1 parent 397d57b
commit 10aa6f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/Xbim.Common/Helpers/AttributeHelper.cs b/Xbim.Common/Helpers/AttributeHelper.cs
@@ -29,19 +29,9 @@ public class AttributeHelper
 		/// <returns></returns>
 		public static IEnumerable<T> GetAttributes<T>(ICustomAttributeProvider mInfo, bool inherit) where T : System.Attribute
 		{
-			IEnumerable<T> result = null;
-
-			if (mInfo != null)
-			{
-				T[] attributes = (T[])mInfo.GetCustomAttributes(typeof(T), inherit);
-
-				if (attributes != null && attributes.Count() > 0)
-				{
-					result = new List<T>(attributes);
-				}
-			}
-
-			return result;
+		    if (mInfo == null) return null;
+		    var attributes = mInfo.GetCustomAttributes(typeof(T), inherit).OfType<T>().ToList();
+		    return attributes.Any() ? attributes : Enumerable.Empty<T>();
 		}
 
 		/// <summary>
@@ -53,15 +43,7 @@ public class AttributeHelper
 		/// <returns></returns>
 		public static T GetAttribute<T>(ICustomAttributeProvider mInfo, bool inherit) where T : System.Attribute
 		{
-			IEnumerable<T> attributes = GetAttributes<T>(mInfo, inherit);
-			T attribute = null;
-
-			if (attributes != null)
-			{
-				attribute = attributes.First();
-			}
-
-			return attribute;
+			return GetAttributes<T>(mInfo, inherit).FirstOrDefault();			
 		}
 
 		/// <summary>
@@ -71,17 +53,9 @@ public class AttributeHelper
 		/// <param name="inherit"></param>
 		/// <returns></returns>
 		public static string GetDescriptionAttributeValue(MemberInfo mInfo, bool inherit)
-		{
-			string attributeValue = string.Empty;
-
-			DescriptionAttribute attribute = GetAttribute<DescriptionAttribute>(mInfo, inherit);
-
-			if (attribute != null)
-			{
-				attributeValue = attribute.Description;
-			}
-
-			return attributeValue;
+		{			
+			var attribute = GetAttribute<DescriptionAttribute>(mInfo, inherit);
+		    return attribute != null ? attribute.Description : string.Empty;	
 		}
 	}
 }
diff --git a/Xbim.Essentials.nuspec b/Xbim.Essentials.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
     <metadata>
         <id>Xbim.Essentials</id>
-        <version>3.0.23</version>
+        <version>3.0.24</version>
         <title>xBIM Essentials</title>
         <authors>xBIM team</authors>
         <owners>Steve Lockley</owners>

diff --git a/Xbim.IO/IXbimGeometryCreator.cs b/Xbim.IO/IXbimGeometryCreator.cs
@@ -15,6 +15,7 @@ public interface IXbimGeometryCreator
         ILogger Logger { get; }
 
         IXbimGeometryObject Create(IfcGeometricRepresentationItem ifcRepresentation);
+        IXbimGeometryObject Create(IfcGeometricRepresentationItem ifcRepresentation, IfcAxis2Placement3D objectLocation);
         /// <summary>
         /// 
         /// </summary>