LPS-71745 Match pattern in liferay.lib.portal.dir

liferay · Jun 14, 2017 · da1ca50 · da1ca50
1 parent b2ee828
commit da1ca50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -707,7 +707,7 @@ information.
 				<sysproperty key="junit.code.coverage" value="${junit.code.coverage}" />
 				<sysproperty if:true="${jvm.debug}" key="jvm.debug" value="true" />
 				<sysproperty key="liferay.lib.portal.dir" value="${app.server.tomcat.lib.portal.dir}" />
-				<sysproperty key="liferay.portal.temp.dir" value="${app.server.tomcat.temp.dir}" />
+				<sysproperty key="liferay.temp.dir" value="${app.server.tomcat.temp.dir}" />
 				<sysproperty if:true="${aspectj.weaver.enabled}" key="org.aspectj.weaver.loadtime.configuration" value="${aspectj.configuration}" />
 				<sysproperty key="whip.agent" value="${whip.agent}" />
 				<sysproperty file="test-coverage/@{test.type}/whip.dat" key="whip.datafile" />

diff --git a/portal-kernel/test/unit/com/liferay/portal/empty/temp/dir/EmptyTempDirTest.java b/portal-kernel/test/unit/com/liferay/portal/empty/temp/dir/EmptyTempDirTest.java
@@ -29,8 +29,7 @@ public class EmptyTempDirTest {
 
 	@Test
 	public void testEmptyTempDir() {
-		File tempDir = new File(
-			System.getProperty("liferay.portal.temp.dir"));
+		File tempDir = new File(System.getProperty("liferay.temp.dir"));
 
 		List<String> fileNames = Arrays.asList(tempDir.list());