From: Augustin Degomme <augustin.degomme@imag.fr>
Date: Tue, 19 Aug 2014 15:00:18 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_12~850^2~12
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b02bb19b1e74c524c3631342571d9e02accbf768?hp=2e185540fa6bda4bb82e96a881508c7b81152629

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp
index 2e636fc2ef..2421ea5496 100644
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -85,6 +85,7 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_
     if(latency) {
       *latency += source->loopback->getLatency();
     }
+    return;
   }
 
   currentNode = source;