From 0cf35db703fe6353fb44d85d9ad49b6286781777 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 3 Oct 2017 16:10:59 +0700
Subject: [PATCH] ControlFlowAnalyzer: fixed random activity test

---
 .../intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java   | 2 +-
 .../inspection/dataFlow/fixture/ArrayInitializerLength.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
index 02c4bc6a56e5..24e9beddcf1a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
@@ -1049,7 +1049,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
     PsiElement parent = PsiUtil.skipParenthesizedExprUp(expression.getParent());
     if (parent instanceof PsiVariable) {
       // initialization
-      return getFactory().getVarFactory().createVariableValue((PsiVariable)expression.getParent(), false);
+      return getFactory().getVarFactory().createVariableValue((PsiVariable)parent, false);
     }
     if (parent instanceof PsiAssignmentExpression) {
       PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent;
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ArrayInitializerLength.java b/java/java-tests/testData/inspection/dataFlow/fixture/ArrayInitializerLength.java
index bd1d9395b86a..2640b5ff9380 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/ArrayInitializerLength.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/ArrayInitializerLength.java
@@ -41,7 +41,7 @@ class ArrayInitializerLength {
   }
 
   void testMultiDimensional() {
-    int[][][] arr = new int[1][2][3];
+    int[][][] arr = (new int[1][2][3]);
     if(<warning descr="Condition 'arr.length == 1' is always 'true'">arr.length == 1</warning>) {
       System.out.println("ok");
     }