From b868d9e795ceed3792319f95cad88df8aab5906d Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Wed, 1 Jul 2009 15:37:19 +0400
Subject: [PATCH] cleanup

---
 .../impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java  | 1 +
 .../codeInspection/dataFlow/instructions/FieldReferenceInstruction.java | 2 +-
 .../intellij/codeInspection/dataFlow/instructions/PopInstruction.java   | 2 +-
 .../codeInspection/dataFlow/instructions/ReturnInstruction.java         | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java b/inspections/impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java
index 8b5504441e..a1ccf06571 100644
--- a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java
+++ b/inspections/impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java
@@ -11,6 +11,7 @@ package com.intellij.codeInspection.dataFlow;
 import com.intellij.codeInspection.dataFlow.instructions.Instruction;
 
 public class DfaInstructionState {
+  public static final DfaInstructionState[] EMPTY_ARRAY = new DfaInstructionState[0];
   private final DfaMemoryState myBeforeMemoryState;
   private final Instruction myInstruction;
   private long myDistanceFromStart = 0;
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java b/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java
index d3e07f5cee..2f1b78bd3e 100644
--- a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java
+++ b/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java
@@ -28,7 +28,7 @@ public class FieldReferenceInstruction extends Instruction {
     final DfaValue qualifier = memState.pop();
     if (myIsPhysical && !memState.applyNotNull(qualifier)) {
       onInstructionProducesNPE(runner);
-      return new DfaInstructionState[0];
+      return DfaInstructionState.EMPTY_ARRAY;
     }
 
     return new DfaInstructionState[]{new DfaInstructionState(runner.getInstruction(getIndex() + 1), memState)};
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java b/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java
index f4655446d7..8bde3c68f3 100644
--- a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java
+++ b/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java
@@ -13,7 +13,7 @@ import com.intellij.codeInspection.dataFlow.*;
 public class PopInstruction extends Instruction {
   public DfaInstructionState[] apply(DataFlowRunner runner, DfaMemoryState memState) {
     memState.pop();
-    return new DfaInstructionState[] {new DfaInstructionState(runner.getInstruction(getIndex() + 1), memState)};
+    return super.apply(runner, memState);
   }
 
   public String toString() {
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java b/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java
index 84747314bb..be8b0e86f3 100644
--- a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java
+++ b/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java
@@ -12,7 +12,7 @@ import com.intellij.codeInspection.dataFlow.*;
 
 public class ReturnInstruction extends Instruction {
   public DfaInstructionState[] apply(DataFlowRunner runner, DfaMemoryState memState) {
-    return new DfaInstructionState[0];
+    return DfaInstructionState.EMPTY_ARRAY;
   }
 
   public String toString() {
-- 
2.11.4.GIT