Merge remote-tracking branch 'origin/master'

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(<warning descr="Condition 'THIRD == \"fd\"' is always 'true'">THIRD == "fd"</warning>);
   }
 }

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(); }

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()) {