Merge d1fc0f5 into c48e731

CorfuDB · Dec 6, 2017 · 343bcda · 343bcda
2 parents c48e731 + d1fc0f5
commit 343bcda
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/runtime/src/main/java/org/corfudb/runtime/CorfuRuntime.java b/runtime/src/main/java/org/corfudb/runtime/CorfuRuntime.java
@@ -531,14 +531,17 @@ private CompletableFuture<Layout> fetchLayout() {
                         // it is acceptable (at least the code on 10/13/2016 does not have issues)
                         // but setEpoch of routers needs to be synchronized as those variables are
                         // not local.
-                        try {
-                            l.getAllServers().stream().map(getRouterFunction).forEach(x ->
-                                    x.setEpoch(l.getEpoch()));
-                        } catch (NetworkException ne) {
-                            // We have already received the layout and there is no need to keep client waiting.
-                            // NOTE: This is true assuming this happens only at router creation.
-                            // If not we also have to take care of setting the latest epoch on Client Router.
-                            log.warn("fetchLayout: Error getting router : {}", ne);
+                        for (String server : l.getAllServers()) {
+                            try {
+                                getRouter(server).setEpoch(l.getEpoch());
+                            } catch (NetworkException ne) {
+                                // We have already received the layout and there is no need to keep
+                                // client waiting.
+                                // NOTE: This is true assuming this happens only at router creation.
+                                // If not we also have to take care of setting the latest epoch on
+                                // Client Router.
+                                log.warn("fetchLayout: Error getting router : {}", ne);
+                            }
                         }
                         layoutServers = l.getLayoutServers();
                         layout = layoutFuture;