You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/01/07 00:17:48 UTC

[35/50] [abbrv] phoenix git commit: PHOENIX-2552 Fix hanging Jenkins builds

PHOENIX-2552 Fix hanging Jenkins builds


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/58465b31
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/58465b31
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/58465b31

Branch: refs/heads/4.x-HBase-1.0
Commit: 58465b31e929bae50f2ac6a33cabd2df1d82d554
Parents: 4cc7f3c
Author: James Taylor <jt...@salesforce.com>
Authored: Fri Jan 1 17:23:12 2016 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Fri Jan 1 17:24:32 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/58465b31/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 e70b35f..18bc502 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();
             }