--- a/jdk/src/share/classes/java/util/HashMap.java	Mon Dec 16 19:52:55 2013 +0000
+++ b/jdk/src/share/classes/java/util/HashMap.java	Fri Dec 13 13:35:35 2013 -0800
@@ -1116,13 +1116,13 @@
             }
         }
         V v = mappingFunction.apply(key);
-        if (old != null) {
+        if (v == null) {
+            return null;
+        } else if (old != null) {
             old.value = v;
             afterNodeAccess(old);
             return v;
         }
-        else if (v == null)
-            return null;
         else if (t != null)
             t.putTreeVal(this, tab, hash, key, v);
         else {