--- a/jdk/src/java.base/share/classes/java/util/TreeMap.java	Thu Dec 17 20:42:01 2015 +0300
+++ b/jdk/src/java.base/share/classes/java/util/TreeMap.java	Thu Dec 17 21:14:58 2015 +0300
@@ -852,7 +852,11 @@
      */
     public Collection<V> values() {
         Collection<V> vs = values;
-        return (vs != null) ? vs : (values = new Values());
+        if (vs == null) {
+            vs = new Values();
+            values = vs;
+        }
+        return vs;
     }
 
     /**