IDEA-31555 Wrong warning: method invocation may produce a NullPointerException

java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java

@@ -685,7 +685,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
   private void addGotoCatch(CatchDescriptor cd) {
     addInstruction(new PushInstruction(myFactory.getVarFactory().create(cd.getParameter(), false), null));
     addInstruction(new SwapInstruction());
-    addInstruction(new AssignInstruction(null));
+    myCurrentFlow.addInstruction(new AssignInstruction(null));
     addInstruction(new PopInstruction());
     addInstruction(new GotoInstruction(cd.getJumpOffset()));
   }

java/java-tests/testData/inspection/dataFlow/fixture/VisitFinallyOnce.java

@@ -0,0 +1,39 @@
+import java.io.IOException;
+
+class TestIDEAWarn {
+  private Connection _connection;
+
+  public void warn() throws IOException {
+    try {
+      if (_connection != null) {
+        try {
+          _connection.commit();
+        } finally {
+          _connection.close();
+          _connection = null;
+        }
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public void warn2() throws IOException {
+    if (_connection == null) return;
+    try {
+      try {
+        _connection.commit();
+      } finally {
+        _connection.close();
+        _connection = null;
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  interface Connection {
+    void commit() throws IOException;
+    void close() throws IOException;
+  }
+}

java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java

@@ -71,5 +71,6 @@ public class DataFlowInspectionFixtureTest extends JavaCodeInsightFixtureTestCas
   public void testContinueFlushesLoopVariable() throws Throwable { doTest(); }
 
   public void testEqualsNotNull() throws Throwable { doTest(); }
+  public void testVisitFinallyOnce() throws Throwable { doTest(); }
 
 }