Skip to content

Commit 10b9d85

Browse files
committed
Version bump 2.4.9: Allow delete person if pnr is unknown in cpr direct.
1 parent a726c74 commit 10b9d85

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

PART/Source/Core/Config/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@
7575
// You can specify all the values or you can default the Build and Revision Numbers
7676
// by using the '*' as shown below:
7777
// [assembly: AssemblyVersion("1.0.*")]
78-
[assembly: AssemblyVersion("2.4.8.0")]
79-
[assembly: AssemblyFileVersion("2.4.8.0")]
78+
[assembly: AssemblyVersion("2.4.9.0")]
79+
[assembly: AssemblyFileVersion("2.4.9.0")]

PART/Source/Core/Utilities/Constants.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public sealed class Versioning
8686
public static readonly int Minor = 0;
8787

8888
// TODO: Set version manually in Config project
89-
public const string AssemblyVersion = "2.4.8.0";
90-
public const string AssemblyFileVersion = "2.4.8.0";
89+
public const string AssemblyVersion = "2.4.9.0";
90+
public const string AssemblyFileVersion = "2.4.9.0";
9191
}
9292

9393
public static readonly Guid EventBrokerApplicationId = new Guid("{C98F9BE7-2DDE-404a-BAB5-5A7B1BBC3063}");

PART/Source/CprBroker/CPRDirect/CPRDirectClientDataProvider.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,13 @@ public bool RemoveSubscription(PersonIdentifier personIdentifier)
127127
return true;
128128
} else
129129
{
130-
throw new Exception(error);
130+
// throw new Exception(error);
131+
132+
// Throwing an exception will cancel a person removal attempt.
133+
// We do not want this, e.g. if the error occurs solely because CPR Direct does not recognize a given cpr no.
134+
// BUT we do need to log the error in case of other scenarios.
135+
Admin.LogError(error);
136+
return true;
131137
}
132138
}
133139
else

PART/Source/CprBroker/WixInstaller/Product.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
44

5-
<Product Id="632b6f92-1383-4138-8d75-5a153d2c96c4" Name="Cpr Broker" Language="1033" Version="2.4.8.0" Manufacturer="OS2 - Public Digitalization Network" UpgradeCode="FF0F6556-3323-43A8-9AB3-E567BEF13F6A">
5+
<Product Id="85e0afd9-db30-4ce6-8fd0-b69c9fceb5dd" Name="Cpr Broker" Language="1033" Version="2.4.9.0" Manufacturer="OS2 - Public Digitalization Network" UpgradeCode="FF0F6556-3323-43A8-9AB3-E567BEF13F6A">
66

77
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/> <!-- InstallScope="perMachine" requires elevated privileges. -->
88
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -27,10 +27,10 @@
2727
-->
2828
<Upgrade Id="FF0F6556-3323-43A8-9AB3-E567BEF13F6A">
2929
<!--Detect old version -->
30-
<UpgradeVersion Maximum="2.4.8.0" IncludeMaximum="no" Property="OLDER_VERSION_DETECTED" OnlyDetect="yes" MigrateFeatures="yes" />
30+
<UpgradeVersion Maximum="2.4.9.0" IncludeMaximum="no" Property="OLDER_VERSION_DETECTED" OnlyDetect="yes" MigrateFeatures="yes" />
3131

3232
<!--Detect newer versions, set a property that triggers a condition failure -->
33-
<UpgradeVersion Minimum="2.4.8.0" IncludeMinimum="no" Property="NEWER_VERSION_DETECTED" OnlyDetect="yes" />
33+
<UpgradeVersion Minimum="2.4.9.0" IncludeMinimum="no" Property="NEWER_VERSION_DETECTED" OnlyDetect="yes" />
3434
</Upgrade>
3535

3636
<!-- Special detection for 2.2.2 buggy upgrade code-->

0 commit comments

Comments
 (0)