[java-identity-provider] branch main updated: IDP-1802 - Empty default for idp.persistentId.retryableErrors

Scott Cantor cantor.2 at osu.edu
Thu Apr 22 14:41:58 UTC 2021


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=c3f5813a3b823d56a9328a7b6279b3353995e5f5

The following commit(s) were added to refs/heads/main by this push:
       new  c3f5813a3 IDP-1802 - Empty default for idp.persistentId.retryableErrors
c3f5813a3 is described below

commit c3f5813a3b823d56a9328a7b6279b3353995e5f5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 22 10:41:55 2021 -0400

    IDP-1802 - Empty default for idp.persistentId.retryableErrors
    
    https://issues.shibboleth.net/jira/browse/IDP-1802
---
 .../src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml   | 2 +-
 idp-conf/src/main/resources/conf/saml-nameid.properties                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
index 0073b49e7..cc1336119 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
@@ -80,7 +80,7 @@
             p:createTimeColumn="#{'%{idp.persistentId.createTimeColumn:creationDate}'.trim()}"
             p:deactivationTimeColumn="#{'%{idp.persistentId.deactivationTimeColumn:deactivationDate}'.trim()}">
         <property name="retryableErrors">
-            <bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.persistentId.retryableErrors:}'.trim()}" />
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.persistentId.retryableErrors:23000,23505}'.trim()}" />
         </property>
     </bean>    
     
diff --git a/idp-conf/src/main/resources/conf/saml-nameid.properties b/idp-conf/src/main/resources/conf/saml-nameid.properties
index 027e9b521..08b66c500 100644
--- a/idp-conf/src/main/resources/conf/saml-nameid.properties
+++ b/idp-conf/src/main/resources/conf/saml-nameid.properties
@@ -25,5 +25,7 @@ idp.persistentId.encoding = BASE32
 #idp.persistentId.generator = shibboleth.ComputedPersistentIdGenerator
 # For basic use, set this to a JDBC DataSource bean name:
 #idp.persistentId.dataSource = PersistentIdDataSource
+# Controls which JDBC error codes are treated as retryable
+#idp.persistentId.retryableErrors = 23000,23505
 # Set to an empty property to skip hash-based generation of first stored ID
 #idp.persistentId.computed = shibboleth.ComputedPersistentIdGenerator

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list