use other instead that

dnhatn · dnhatn · commit 6cca0801d27a · 2017-10-26T13:40:23.000-04:00
diff --git a/core/src/main/java/org/elasticsearch/index/shard/DocsStats.java b/core/src/main/java/org/elasticsearch/index/shard/DocsStats.java
@@ -45,13 +45,13 @@ public DocsStats(long count, long deleted, long totalSizeInBytes) {
         this.totalSizeInBytes = totalSizeInBytes;
     }
 
-    public void add(DocsStats that) {
-        if (that == null) {
+    public void add(DocsStats other) {
+        if (other == null) {
             return;
         }
-        this.totalSizeInBytes += that.totalSizeInBytes;
-        this.count += that.count;
-        this.deleted += that.deleted;
+        this.totalSizeInBytes += other.totalSizeInBytes;
+        this.count += other.count;
+        this.deleted += other.deleted;
     }
 
     public long getCount() {

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ public DocsStats(long count, long deleted, long totalSizeInBytes) {`
`45`	`45`	`this.totalSizeInBytes = totalSizeInBytes;`
`46`	`46`	`}`
`47`	`47`
`48`		`- public void add(DocsStats that) {`
`49`		`- if (that == null) {`
	`48`	`+ public void add(DocsStats other) {`
	`49`	`+ if (other == null) {`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`		`- this.totalSizeInBytes += that.totalSizeInBytes;`
`53`		`- this.count += that.count;`
`54`		`- this.deleted += that.deleted;`
	`52`	`+ this.totalSizeInBytes += other.totalSizeInBytes;`
	`53`	`+ this.count += other.count;`
	`54`	`+ this.deleted += other.deleted;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public long getCount() {`