- .NET API: fixed bug in DataSet destructor

dotnet/IEC61850forCSharp/DataSet.cs

@@ -37,22 +37,22 @@ namespace IEC61850
         public class DataSet : IDisposable
         {
             [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
-			static extern void ClientDataSet_destroy (IntPtr self);
+            static extern void ClientDataSet_destroy(IntPtr self);
 
             [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
-			static extern IntPtr ClientDataSet_getValues (IntPtr self);
+            static extern IntPtr ClientDataSet_getValues(IntPtr self);
 
             [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
-			static extern IntPtr ClientDataSet_getReference (IntPtr self);
+            static extern IntPtr ClientDataSet_getReference(IntPtr self);
 
             [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
-			static extern int ClientDataSet_getDataSetSize (IntPtr self);
+            static extern int ClientDataSet_getDataSetSize(IntPtr self);
 
             private IntPtr nativeObject;
             private MmsValue values = null;
             private string reference = null;
 
-			internal DataSet (IntPtr nativeObject)
+            internal DataSet(IntPtr nativeObject)
             {
                 this.nativeObject = nativeObject;
             }
@@ -63,12 +63,13 @@ namespace IEC61850
             /// <returns>
             /// object reference.
             /// </returns>
-			public string GetReference ()
+			public string GetReference()
             {
-				if (reference == null) {
+                if (reference == null)
-					IntPtr nativeString = ClientDataSet_getReference (nativeObject);
+                {
+                    IntPtr nativeString = ClientDataSet_getReference(nativeObject);
 
-					reference = Marshal.PtrToStringAnsi (nativeString);
+                    reference = Marshal.PtrToStringAnsi(nativeString);
                 }
 
                 return reference;
@@ -83,12 +84,13 @@ namespace IEC61850
             /// <returns>
             /// The locally stored values of the data set (as MmsValue instance of type MMS_ARRAY)
             /// </returns>
-			public MmsValue GetValues ()
+			public MmsValue GetValues()
+            {
+                if (values == null)
                 {
-				if (values == null) {
+                    IntPtr nativeValues = ClientDataSet_getValues(nativeObject);
-					IntPtr nativeValues = ClientDataSet_getValues (nativeObject);
 
-					values = new MmsValue (nativeValues, false);
+                    values = new MmsValue(nativeValues, false);
                 }
 
                 return values.Clone();
@@ -101,27 +103,29 @@ namespace IEC61850
             /// <returns>
             /// the number of elementes (data set members)
             /// </returns>
-			public int GetSize ()
+			public int GetSize()
             {
-				return ClientDataSet_getDataSetSize (nativeObject);
+                return ClientDataSet_getDataSetSize(nativeObject);
             }
 
             public void Dispose()
             {
-                lock (this) {
+                lock (this)
-                    if (nativeObject != IntPtr.Zero) {
+                {
-                        ClientDataSet_destroy (nativeObject);
+                    if (nativeObject != IntPtr.Zero)
+                    {
+                        ClientDataSet_destroy(nativeObject);
                         nativeObject = IntPtr.Zero;
                     }
                 }
             }
 
-			~DataSet ()
+            ~DataSet()
             {
-				ClientDataSet_destroy (nativeObject);
+                Dispose();
             }
 
-			internal IntPtr getNativeInstance ()
+            internal IntPtr getNativeInstance()
             {
                 return nativeObject;
             }

src/iec61850/client/ied_connection.c

@@ -3253,7 +3253,7 @@ IedConnection_readDataSetValues(IedConnection self, IedClientError* error, const
         dataSetVal = MmsConnection_readNamedVariableListValuesAssociationSpecific(self->connection,
                 &mmsError, itemId, true);
     else
-        dataSetVal= MmsConnection_readNamedVariableListValues(self->connection, &mmsError,
+        dataSetVal = MmsConnection_readNamedVariableListValues(self->connection, &mmsError,
                     domainId, itemId, true);
 
     if (dataSetVal == NULL) {