[java-identity-provider] branch main updated: IDP-2398 idp.no.tidy is not respected for the input property file

[Rod Widdowson]

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

rdw 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=22a84c46f2a9395bc6a0d0f53ac80139605db365

The following commit(s) were added to refs/heads/main by this push:
     new 22a84c46f IDP-2398 idp.no.tidy is not respected for the input property file
22a84c46f is described below

commit 22a84c46f2a9395bc6a0d0f53ac80139605db365
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Aug 17 11:15:00 2025 +0100

    IDP-2398 idp.no.tidy is not respected for the input property file
    
    https://shibboleth.atlassian.net/browse/IDP-2398
---
 .../idp/installer/impl/InstallerPropertiesImpl.java         | 13 +++++++++++--
 .../java/net/shibboleth/idp/installer/impl/V5Install.java   |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java
index 89719a423..af4698181 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/InstallerPropertiesImpl.java
@@ -144,6 +144,13 @@ public class InstallerPropertiesImpl  {
         };
     }
 
+    /** Set whether we tidy up behind ourselves. */
+    private void setNoTidy() {
+        final String noTidy = installerProperties.getProperty(InstallerProperties.NO_TIDY);
+        tidy = noTidy == null;
+        log.info("Notidy = {} tidy={}", noTidy, tidy);
+    }
+
     /**
      * Initialization routine.
      * 
@@ -169,13 +176,15 @@ public class InstallerPropertiesImpl  {
                 log.error("Could not load {}: {}", propertyFile.toAbsolutePath(), e.getMessage());
                 throw new ComponentInitializationException(e);
             }
+            setNoTidy();
             if (!isNoTidy()) {
                 idpPropertyFile.deleteOnExit();
+                log.info("Marked {} for delete on close", idpPropertyFile.getAbsolutePath());
             }
+        } else {
+            setNoTidy();
         }
 
-        final String noTidy = installerProperties.getProperty(InstallerProperties.NO_TIDY);
-        tidy = noTidy == null;
         final String setModeString = installerProperties.getProperty(InstallerProperties.PERFORM_SET_MODE);
         if (setModeString != null) {
             setGroupAndMode = Boolean.valueOf(setModeString);
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java
index f355a7f75..03de3173d 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java
@@ -232,6 +232,7 @@ public class V5Install {
                     final File mergeFile = mergePath.toFile();
                     if (!installerProps.isNoTidy()) {
                         mergeFile.deleteOnExit();
+                        log.debug("Marked {} for delete on close", mergeFile.getAbsolutePath());
                     }
                     try (final FileInputStream stream = new FileInputStream(mergeFile)) {
                         replacements.load(stream);

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