Return-Path: 
 <commits-return-2450-apmail-hama-commits-archive=hama.apache.org@hama.apache.org>
X-Original-To: apmail-hama-commits-archive@www.apache.org
Delivered-To: apmail-hama-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 93C17E6AC
	for <apmail-hama-commits-archive@www.apache.org>;
 Tue,  8 Jan 2013 01:46:10 +0000 (UTC)
Received: (qmail 53264 invoked by uid 500); 8 Jan 2013 01:46:10 -0000
Delivered-To: apmail-hama-commits-archive@hama.apache.org
Received: (qmail 53241 invoked by uid 500); 8 Jan 2013 01:46:10 -0000
Mailing-List: contact commits-help@hama.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hama.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hama.apache.org>
List-Post: <mailto:commits@hama.apache.org>
List-Id: <commits.hama.apache.org>
Reply-To: dev@hama.apache.org
Delivered-To: mailing list commits@hama.apache.org
Received: (qmail 53231 invoked by uid 99); 8 Jan 2013 01:46:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 01:46:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 01:46:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D9A4323888CD;
	Tue,  8 Jan 2013 01:45:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1430109 -
 /hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java
Date: Tue, 08 Jan 2013 01:45:49 -0000
To: commits@hama.apache.org
From: edwardyoon@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130108014549.D9A4323888CD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: edwardyoon
Date: Tue Jan  8 01:45:49 2013
New Revision: 1430109

URL: http://svn.apache.org/viewvc?rev=1430109&view=rev
Log:
revert my test codes

Modified:
    hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java

Modified: hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java
URL: http://svn.apache.org/viewvc/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java?rev=1430109&r1=1430108&r2=1430109&view=diff
==============================================================================
--- hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java (original)
+++ hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java Tue Jan  8 01:45:49 2013
@@ -105,8 +105,6 @@ public final class GraphJobRunner<V exte
 
   }
 
-  Map<V, List<M>> messages = null;
-
   @Override
   public final void bsp(
       BSPPeer<Writable, Writable, Writable, Writable, GraphJobMessage> peer)
@@ -120,7 +118,7 @@ public final class GraphJobRunner<V exte
       peer.sync();
 
       // note that the messages must be parsed here
-      messages = parseMessages(peer);
+      final Map<V, List<M>> messages = parseMessages(peer);
       // master needs to update
       doMasterUpdates(peer);
       // if aggregators say we don't have updates anymore, break
@@ -128,7 +126,7 @@ public final class GraphJobRunner<V exte
         break;
       }
       // loop over vertices and do their computation
-      doSuperstep(peer);
+      doSuperstep(messages, peer);
 
       if (isMasterTask(peer)) {
         peer.getCounter(GraphJobCounter.ITERATIONS).increment(1);
@@ -177,7 +175,7 @@ public final class GraphJobRunner<V exte
    * Do the main logic of a superstep, namely checking if vertices are active,
    * feeding compute with messages and controlling combiners/aggregators.
    */
-  private void doSuperstep(
+  private void doSuperstep(Map<V, List<M>> messages,
       BSPPeer<Writable, Writable, Writable, Writable, GraphJobMessage> peer)
       throws IOException {
     int activeVertices = 0;
@@ -204,14 +202,10 @@ public final class GraphJobRunner<V exte
           activeVertices++;
         }
       }
-
-      msgs = null;
-      messages.remove(vertex.getVertexID());
     }
 
     aggregationRunner.sendAggregatorValues(peer, activeVertices);
     iteration++;
-    messages = new HashMap<V, List<M>>();
   }
 
   /**
@@ -337,8 +331,8 @@ public final class GraphJobRunner<V exte
   @SuppressWarnings("unchecked")
   private void repair(
       BSPPeer<Writable, Writable, Writable, Writable, GraphJobMessage> peer,
-      boolean selfReference) throws IOException, SyncException,
-      InterruptedException {
+      boolean selfReference) throws IOException,
+      SyncException, InterruptedException {
 
     Map<V, Vertex<V, E, M>> tmp = new HashMap<V, Vertex<V, E, M>>();
 
@@ -414,8 +408,7 @@ public final class GraphJobRunner<V exte
       BSPPeer<Writable, Writable, Writable, Writable, GraphJobMessage> peer)
       throws IOException {
     GraphJobMessage msg = null;
-    Map<V, List<M>> msgMap = new HashMap<V, List<M>>();
-    
+    final Map<V, List<M>> msgMap = new HashMap<V, List<M>>();
     while ((msg = peer.getCurrentMessage()) != null) {
       // either this is a vertex message or a directive that must be read
       // as map
@@ -452,7 +445,6 @@ public final class GraphJobRunner<V exte
       }
 
     }
-    
     return msgMap;
   }
 
@@ -541,3 +533,4 @@ public final class GraphJobRunner<V exte
   }
 
 }
+