PAYARA-2891 Prevent installRoot being overriden by openmq (#5)

payara · Jul 2, 2018 · 4595b68 · 4595b68
1 parent ca30909
commit 4595b68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mq/main/logger/src/main/java/com/sun/messaging/jmq/util/log/Logger.java b/mq/main/logger/src/main/java/com/sun/messaging/jmq/util/log/Logger.java
@@ -518,7 +518,7 @@ private void loadPropsToNucleusLogging(Properties props, ServiceLocator habitat,
     	// that breaks some of ourtests as well. This is a workaround only for outside nucleus env case.
     	Properties p = System.getProperties();
     	String installRoot = StringUtil.expandVariables("${imq.instanceshome}${/}${imq.instancename}", props);
-    	if(!(inProcess && jmsraManaged)) {
+        if(!(inProcess && jmsraManaged) && System.getProperty("com.sun.aas.installRoot") == null) {
     	    p.put("com.sun.aas.installRoot", installRoot);
         }
     	String key = JULLOGFILEKEY;

diff --git a/mq/main/pom.xml b/mq/main/pom.xml
@@ -54,7 +54,7 @@
     <groupId>org.glassfish.mq</groupId>
     <artifactId>mq</artifactId>
     <packaging>pom</packaging>
-    <version> 5.1.1-SNAPSHOT </version>
+    <version>5.1.1.final.payara-p4</version>
     <name>MQ Main Project</name>
 
     <scm>
@@ -67,7 +67,7 @@
 
     <properties>
 	<!-- Change these for each build -->
-	<build.number>6</build.number>
+	<build.number>7</build.number>
         <build.letter>a</build.letter>
 
 	<!-- Product-specific -->