Merge problem fix: unused field removal
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f391196b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f391196b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f391196b Branch: refs/heads/ignite-2.1.2-exchange Commit: f391196b44bf2f7577e7c989785df38fa66e801b Parents: be804b9 Author: dpavlov <[email protected]> Authored: Fri Jun 16 15:34:40 2017 +0300 Committer: dpavlov <[email protected]> Committed: Fri Jun 16 17:59:46 2017 +0300 ---------------------------------------------------------------------- .../cache/persistence/GridCacheDatabaseSharedManager.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f391196b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 0e3aced..9bc56e7 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -2444,9 +2444,6 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan /** Number of deleted WAL files. */ private int walFilesDeleted; - /** Number of deleted WAL files. */ - private int walHistorySize; - /** */ private final int pagesSize; @@ -2713,7 +2710,6 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan } chp.walFilesDeleted = deleted; - chp.walHistorySize = histMap.size(); } /**
