[java-identity-provider] branch main updated: Fix Build

[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=6251caeb8aa83efb4eb069efadcb387b8838d86a

The following commit(s) were added to refs/heads/main by this push:
       new  6251caeb8 Fix Build
6251caeb8 is described below

commit 6251caeb8aa83efb4eb069efadcb387b8838d86a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Mar 9 15:33:47 2021 +0000

    Fix Build
---
 .../src/main/java/net/shibboleth/idp/installer/V4Install.java       | 6 ++++--
 .../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 7967a96b2..2a3bfd5d0 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -498,8 +498,10 @@ public class V4Install extends AbstractInitializableComponent {
                 InstallerSupport.setMode(installerProps.getTargetDir().resolve("system"), "444", "**/*");
             }
             InstallerSupport.setMode(installerProps.getTargetDir().resolve("dist"), "444", "**/*");
-            InstallerSupport.setMode(installerProps.getTargetDir().resolve("dist").resolve("plugin-contents"),
-                    "640", "**/*");
+            final Path pluginContents = installerProps.getTargetDir().resolve("dist").resolve("plugin-contents");
+            if (Files.exists(pluginContents)) {
+                InstallerSupport.setMode(pluginContents,  "640", "**/*");
+            }
             if (currentState.getInstalledVersion() == null) {
                 InstallerSupport.setMode(installerProps.getTargetDir().resolve("credentials"),
                         installerProps.getCredentialsKeyFileMode(), "**/*");
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index a8398577e..73f6beb8d 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -484,7 +484,9 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
         try {
             final Path parent = distPath.resolve("plugin-contents");
             // Just in case it has been deprotected
-            InstallerSupport.setMode(parent, "640", "**/*");
+            if (Files.exists(parent)) {
+                InstallerSupport.setMode(parent, "640", "**/*");
+            }
             Files.createDirectories(parent);
             final Properties props = new Properties(1+copiedFiles.size());
             props.setProperty("idp.plugin.version",

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