From a667131b4c0ad1eb2b1f60931728bbe16c596391 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 20 Mar 2017 18:27:36 +0300 Subject: [PATCH 1/2] macosx jdk exception --- .../com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java index c36ff7784bfd..2847d6f6b2a2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java @@ -136,8 +136,9 @@ public class VfsRootAccess { allowed.add(FileUtil.toSystemIndependentName(System.getProperty("java.io.tmpdir"))); allowed.add(FileUtil.toSystemIndependentName(SystemProperties.getUserHome())); - allowed.add("/etc"); // After recent update of Oracle JDK 1.8 under Ubuntu Certain files in the JDK installation are symlinked to /etc // see IDEA-167037 The assertion "File accessed outside allowed root" is triggered by files symlinked from the the JDK installation folder + allowed.add("/etc"); // After recent update of Oracle JDK 1.8 under Ubuntu Certain files in the JDK installation are symlinked to /etc + allowed.add("/private/etc"); for (final Project project : openProjects) { if (!project.isInitialized()) { From b4f3d9d54e40c4584ab64d8d6d70038c60de7d40 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 20 Mar 2017 16:41:58 +0100 Subject: [PATCH 2/2] fix DataFlowInspectionTest --- .../inspection/dataFlow/fixture/InternedStringConstants.java | 2 +- .../com/intellij/codeInspection/DataFlowInspectionTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/InternedStringConstants.java b/java/java-tests/testData/inspection/dataFlow/fixture/InternedStringConstants.java index aa452db55ab2..a54114207190 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/InternedStringConstants.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/InternedStringConstants.java @@ -5,6 +5,6 @@ class Example { public static final String THIRD = FIRST + SECOND; public static void main(String[] args) { - System.out.println(THIRD == "fd"); + System.out.println(THIRD == "fd"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java index fd790365d43c..a283eeee1b9e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java @@ -95,7 +95,7 @@ public class DataFlowInspectionTest extends DataFlowInspectionTestCase { public void testCheckEnumConstantConstructor() { doTest(); } public void testCompareToEnumConstant() throws Throwable { doTest(); } public void testEqualsConstant() throws Throwable { doTest(); } - public void testInternedStringConstants() throws Throwable { doTest(); } + public void testInternedStringConstants() { doTest(); } public void testDontSaveTypeValue() { doTest(); } public void testFinalLoopVariableInstanceof() throws Throwable { doTest(); } public void testGreaterIsNotEquals() throws Throwable { doTest(); }