Merge pull request #1469 from petercla/master

Remove possible NPE
Netflix · Feb 7, 2017 · 7fdda15 · 7fdda15
2 parents c17d487 + 519e7c8
commit 7fdda15
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java b/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java
@@ -189,10 +189,11 @@ public int size() {
         }
 
         public E peek() {
-            if (top.get() == null) {
+            Node<E> eNode = top.get();
+            if (eNode == null) {
                 return null;
             } else {
-                return top.get().item;
+                return eNode.item;
             }
         }