commit 832c88d568e23fd3638127c4e29e4d76b3cb785b
author ecarm002@ucr.edu <ecarm002@ucr.edu> Fri Oct 18 11:41:44 2013 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> Fri Oct 18 11:41:44 2013 -0700
tree 813e1b843fa02338b5f9f65cfaf6d21557aac540
parent 07ba95f886a7aadb6a841b97ec4246fdca7c4642

Changed commented code to reflect master.

hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/resources/memory/MemoryManager.java

diff --git a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/resources/memory/MemoryManager.java b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/resources/memory/MemoryManager.java
index bd92ff9..4829173 100644
--- a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/resources/memory/MemoryManager.java
+++ b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/resources/memory/MemoryManager.java
@@ -26,10 +26,11 @@
 
     @Override
     public boolean allocate(long memory) {
-//        if (this.memory.addAndGet(-memory) < 0) {
-//            this.memory.addAndGet(memory);
-//            return false;
-//        }
+        // commented as now the deallocation is not implemented yet.
+        //        if (this.memory.addAndGet(-memory) < 0) {
+        //            this.memory.addAndGet(memory);
+        //            return false;
+        //        }
         return true;
     }