From 4dbf9321ebf5faf77dad79e8baf253ce61a9898d Mon Sep 17 00:00:00 2001
From: Tim Eilers <tim.eilers@kps.com>
Date: Tue, 25 Jun 2019 17:03:07 +0200
Subject: [PATCH] Fix basedir management (correctly avoid duplicate resource
 declarations)

---
 manifests/adopt.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/adopt.pp b/manifests/adopt.pp
index 0d29f95..5931ecc 100644
--- a/manifests/adopt.pp
+++ b/manifests/adopt.pp
@@ -121,7 +121,7 @@ define java::adopt (
   $proxy_server   = undef,
   $proxy_type     = undef,
   $basedir        = undef,
-  $manage_basedir = false,
+  $manage_basedir = true,
   $package_type   = undef,
 ) {
 
@@ -342,7 +342,12 @@ define java::adopt (
           }
 
           if $manage_basedir {
-            ensure_resource('file', $_basedir, {'ensure' => 'directory', 'before' => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"]})
+            if (!defined(File[$_basedir])) {
+              file { $_basedir:
+                ensure => 'directory',
+                before => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"],
+              }
+            }
           }
 
           exec { "Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}" :