1 files changed, 5 insertions, 1 deletions
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
index 123bb9df..05ffdbfe 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
@@ -73,7 +73,11 @@ public class PlaceArtifactScripts extends ArtifactDir {
                     "APP="+arti.getNs()+'\n',
                     "EMAIL="+email+ '\n',
                     "JAR=\""+classpath.toString()+"\"\n",
-                    "JAVA=\""+javaHome() + "/bin/" +"java\"\n",
+                    "if [ -z \"$JAVA_HOME\" ]; then \n",
+                    "  JAVA=\""+javaHome() + "/bin/" +"java\"\n",
+                    "else\n",
+                    "  JAVA=\"$JAVA_HOME/bin/java\"\n",
+                    "fi\n",
                     checkScript
                     );