Skip to content

Commit f0c6945

Browse files
author
Francois Normandin
committed
[Fix: 21] Stopping aggregated dependencies no longer can produce a 1556 error on termination when dependency has already been terminated.
1 parent e0302f3 commit f0c6945

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

src/JKI State Machine Objects.vipb

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="0.6" Created_Date="2015-12-04 15:52:35" Modified_Date="2016-08-11 13:53:15" Creator="Francois Normandin" Comments="" ID="328dee4f16219a84e458e426459453d0">
1+
<VI_Package_Builder_Settings Version="0.6" Created_Date="2015-12-04 15:52:35" Modified_Date="2016-08-15 11:33:06" Creator="Francois Normandin" Comments="" ID="158531f3820f5e12b5be1130628e2ab2">
22
<Library_General_Settings>
33
<Package_File_Name>JKI_StateMachineObjects</Package_File_Name>
4-
<Library_Version>1.1.7.32</Library_Version>
4+
<Library_Version>1.1.8.33</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..\..\..</Library_Output_Folder>
@@ -41,11 +41,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
4141
<Copyright/>
4242
<Packager>JKI</Packager>
4343
<URL>https://github.com/JKISoftware/JKI-State-Machine-Objects</URL>
44-
<Release_Notes>[Feature: 14] Added a method for process to call a Self-Terminate method.
45-
46-
[Feature: 17] Launch Dependency public method now returns the SMO reference of the created dependency.
47-
48-
[Fix: 20] Parse URI method now correctly handles a simple path preceeded with "/" character.</Release_Notes>
44+
<Release_Notes>[Fix: 21] Stopping aggregated dependencies no longer can produce a 1556 error on termination when dependency has already been terminated.</Release_Notes>
4945
</Description>
5046
<Destinations>
5147
<Toolkit_VIs>
@@ -260,7 +256,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
260256
<Path>Example--SMO.Example.vi</Path>
261257
<VI_Title/>
262258
</Items_Data>
263-
<GUID>BA02B993979EA3BD102F3D64A2E65A44</GUID>
259+
<GUID>3B0F9D28C135B34B2980C5A01EE842DD</GUID>
264260
</Functions_Palette_Data>
265261
<Functions_Palette_Data>
266262
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -477,7 +473,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
477473
<Path>SMO\WaitForStateChange.vi</Path>
478474
<VI_Title/>
479475
</Items_Data>
480-
<GUID>7EE2727F95B773F52BFB1D06CACCB01D</GUID>
476+
<GUID>2F41C9F36017FBA28446259F569CA8CE</GUID>
481477
</Functions_Palette_Data>
482478
<Functions_Palette_Data>
483479
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -610,7 +606,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
610606
<Path>Protected</Path>
611607
<VI_Title/>
612608
</Items_Data>
613-
<GUID>1B79331763A2CBBAE3964E5F2A01C553</GUID>
609+
<GUID>48EC797535BC0642BEEA9BAA6F44CF36</GUID>
614610
</Functions_Palette_Data>
615611
<Functions_Palette_Data>
616612
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -743,7 +739,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
743739
<Path>SMO\Protected\ThisLevelClassName.vi</Path>
744740
<VI_Title/>
745741
</Items_Data>
746-
<GUID>EF6CCE9D386124DFF705C7276A0A15C6</GUID>
742+
<GUID>9B249B0698E00A2C7C882F08A466F973</GUID>
747743
</Functions_Palette_Data>
748744
<Functions_Palette_Data>
749745
<Parent_Palette_Index>2</Parent_Palette_Index>
@@ -778,7 +774,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
778774
<Path>SMO.UI\Show User Interface.vi</Path>
779775
<VI_Title/>
780776
</Items_Data>
781-
<GUID>2DA26889036971416C1910CA646B169E</GUID>
777+
<GUID>B2BFF7EDBC01067370BC50F561EA6E28</GUID>
782778
</Functions_Palette_Data>
783779
<Functions_Palette_Data>
784780
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -827,7 +823,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
827823
<Path>URI Parsing\Parse URI.vi</Path>
828824
<VI_Title/>
829825
</Items_Data>
830-
<GUID>07F4B90BA4B637F821A31488C2584B8D</GUID>
826+
<GUID>F79A2A93F8E285E7F5F281AA6ECA0702</GUID>
831827
</Functions_Palette_Data>
832828
</Library_Palette_Definition>
833829
</VI_Package_Builder_Settings>

src/SMO/Protected/onStop.vi

1.68 KB
Binary file not shown.

tests/SMO_Test.lvproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<Item Name="SMO_TestSuite.lvclass" Type="LVClass" URL="../SMO_TestSuite/SMO_TestSuite.lvclass"/>
2424
<Item Name="SMO_TestCase.lvclass" Type="LVClass" URL="../SMO_TestCase/SMO_TestCase.lvclass"/>
2525
<Item Name="SMO.UI_TestCase.lvclass" Type="LVClass" URL="../SMO.UI_TestCase/SMO.UI_TestCase.lvclass"/>
26+
<Item Name="Test-AggregationLifetimeError.vi" Type="VI" URL="../Test-AggregationLifetimeError.vi"/>
2627
<Item Name="Dependencies" Type="Dependencies">
2728
<Item Name="vi.lib" Type="Folder">
2829
<Item Name="0B2DDAC1EBDDD091B2E934D251FB5792" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/0B2DDAC1EBDDD091B2E934D251FB5792"/>
@@ -276,7 +277,6 @@
276277
<Item Name="Set Cursor (Cursor ID).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Cursor ID).vi"/>
277278
<Item Name="Set Cursor (Icon Pict).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Icon Pict).vi"/>
278279
<Item Name="Set Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Busy.vi"/>
279-
<Item Name="_TextTestResult.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_TextTestResult.llb/_TextTestResult.lvclass"/>
280280
</Item>
281281
<Item Name="SMO.lvclass" Type="LVClass" URL="../../src/SMO/SMO.lvclass"/>
282282
<Item Name="Attribute.lvclass" Type="LVClass" URL="../../src/Support/Attribute/Attribute.lvclass"/>

tests/SMO_TestCase/SMO_TestCase.lvclass

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/SMO_TestCase/setUp.vi

0 Bytes
Binary file not shown.
10.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)