Revert "PHOENIX-2552 Fix hanging Jenkins builds" This reverts commit b624fbf26615359683dfa5fd2b7919e758085d39.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/139e0d74 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/139e0d74 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/139e0d74 Branch: refs/heads/4.x-HBase-1.0 Commit: 139e0d74eb13cfa6b5da58a2ee5218c4a7cb08a5 Parents: dd3028c Author: James Taylor <[email protected]> Authored: Sat Jan 2 10:29:50 2016 -0800 Committer: James Taylor <[email protected]> Committed: Sat Jan 2 10:29:50 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/memory/GlobalMemoryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/139e0d74/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java b/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java index 18bc502..e70b35f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java @@ -151,7 +151,7 @@ public class GlobalMemoryManager implements MemoryManager { if (size > 0) { logger.warn("Orphaned chunk of " + size + " bytes found during finalize"); } - //freeMemory(); + freeMemory(); } finally { super.finalize(); }
