X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/829b0c9f55b2cda57fb9371026214dd3c646e9c1..c8bcfe7ac56e69ba55d4797455a6b637baeec83e:/src/surf/surf_routing_generic.cpp

diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp
index 853f11e97c..c67abb4407 100644
--- a/src/surf/surf_routing_generic.cpp
+++ b/src/surf/surf_routing_generic.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2013. The SimGrid Team.
+/* Copyright (c) 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -234,7 +234,8 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src,
 
     if (src == NULL || dst == NULL)
       xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
-          src->getName(), dst->getName(), p_name);
+              src ? src->getName() : "(null)",
+              dst ? dst->getName() : "(null)", p_name);
 
     src_as = src->getRcComponent();
     dst_as = dst->getRcComponent();
@@ -439,20 +440,14 @@ AsPtr AsGeneric::processingUnitsExist(char *element)
 
 void AsGeneric::srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr dst)
 {
-
-  RoutingEdgePtr src_data = src;
-  RoutingEdgePtr dst_data = dst;
-
-  if (src_data == NULL || dst_data == NULL)
+  if (src == NULL || dst == NULL)
     xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
-        src->getName(),
-        dst->getName(),
-        p_name);
+            src ? src->getName() : "(null)",
+            dst ? dst->getName() : "(null)",
+            p_name);
 
-  AsPtr src_as =
-      (src_data)->getRcComponent();
-  AsPtr dst_as =
-      (dst_data)->getRcComponent();
+  AsPtr src_as = src->getRcComponent();
+  AsPtr dst_as = dst->getRcComponent();
 
   if (src_as != dst_as)
     xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",