Skip to content

Commit 2d0faac

Browse files
authored
Merge pull request #380 from AppDevNext/qiduhe/master
Simplify View reference memory leak
2 parents 60c9a14 + 4bf7d3d commit 2d0faac

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ public static AnimatedMoveViewJob getInstance(ViewPortHandler viewPortHandler, f
3737

3838
public static void recycleInstance(AnimatedMoveViewJob instance){
3939
// Clear reference avoid memory leak
40-
instance.mViewPortHandler = null;
4140
instance.xValue = 0f;
4241
instance.yValue = 0f;
43-
instance.mTrans = null;
44-
instance.view = null;
4542
instance.xOrigin = 0f;
4643
instance.yOrigin = 0f;
4744
instance.animator.setDuration(0);
45+
instance.recycle();
4846
pool.recycle(instance);
4947
}
5048

MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ public static MoveViewJob getInstance(ViewPortHandler viewPortHandler, float xVa
3232
public static void recycleInstance(MoveViewJob instance){
3333
instance.recycle();
3434
// Clear reference avoid memory leak
35-
instance.mViewPortHandler = null;
3635
instance.xValue = 0f;
3736
instance.yValue = 0f;
38-
instance.mTrans = null;
39-
instance.view = null;
4037
pool.recycle(instance);
4138
}
4239

MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ public static void recycleInstance(ZoomJob instance) {
4242
instance.yValue = 0f;
4343
instance.scaleX = 0f;
4444
instance.scaleY = 0f;
45-
instance.mViewPortHandler = null;
46-
instance.mTrans = null;
4745
instance.axisDependency = null;
48-
instance.view = null;
46+
instance.recycle();
4947
pool.recycle(instance);
5048
}
5149

0 commit comments

Comments
 (0)