From 3b247e37486d35c6a6d0b84f09f7d0563da00274 Mon Sep 17 00:00:00 2001 From: mduigou Date: Fri, 11 Apr 2014 14:05:35 -0700 Subject: [PATCH] 8035284: Remove redundant initializations to null Reviewed-by: lancea, martin, chegar, shade --- src/share/classes/java/util/AbstractMap.java | 4 ++-- src/share/classes/java/util/Collections.java | 22 +++++++++---------- src/share/classes/java/util/EnumMap.java | 4 ++-- src/share/classes/java/util/Hashtable.java | 10 ++++----- .../classes/java/util/IdentityHashMap.java | 4 ++-- src/share/classes/java/util/LinkedList.java | 2 +- src/share/classes/java/util/TreeMap.java | 18 +++++++-------- src/share/classes/java/util/WeakHashMap.java | 10 ++++----- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/share/classes/java/util/AbstractMap.java b/src/share/classes/java/util/AbstractMap.java index c16819445..1067394cb 100644 --- a/src/share/classes/java/util/AbstractMap.java +++ b/src/share/classes/java/util/AbstractMap.java @@ -305,8 +305,8 @@ public abstract class AbstractMap implements Map { * appropriate view the first time this view is requested. The views are * stateless, so there's no reason to create more than one of each. */ - transient volatile Set keySet = null; - transient volatile Collection values = null; + transient volatile Set keySet; + transient volatile Collection values; /** * {@inheritDoc} diff --git a/src/share/classes/java/util/Collections.java b/src/share/classes/java/util/Collections.java index 580f461f7..83d4419e8 100644 --- a/src/share/classes/java/util/Collections.java +++ b/src/share/classes/java/util/Collections.java @@ -1466,9 +1466,9 @@ public class Collections { throw new UnsupportedOperationException(); } - private transient Set keySet = null; - private transient Set> entrySet = null; - private transient Collection values = null; + private transient Set keySet; + private transient Set> entrySet; + private transient Collection values; public Set keySet() { if (keySet==null) @@ -2597,9 +2597,9 @@ public class Collections { synchronized (mutex) {m.clear();} } - private transient Set keySet = null; - private transient Set> entrySet = null; - private transient Collection values = null; + private transient Set keySet; + private transient Set> entrySet; + private transient Collection values; public Set keySet() { synchronized (mutex) { @@ -3082,7 +3082,7 @@ public class Collections { return c.add(e); } - private E[] zeroLengthElementArray = null; // Lazily initialized + private E[] zeroLengthElementArray; // Lazily initialized private E[] zeroLengthElementArray() { return zeroLengthElementArray != null ? zeroLengthElementArray : @@ -3643,7 +3643,7 @@ public class Collections { m.put(e.getKey(), e.getValue()); } - private transient Set> entrySet = null; + private transient Set> entrySet; public Set> entrySet() { if (entrySet==null) @@ -4877,9 +4877,9 @@ public class Collections { public boolean containsValue(Object value) {return eq(value, v);} public V get(Object key) {return (eq(key, k) ? v : null);} - private transient Set keySet = null; - private transient Set> entrySet = null; - private transient Collection values = null; + private transient Set keySet; + private transient Set> entrySet; + private transient Collection values; public Set keySet() { if (keySet==null) diff --git a/src/share/classes/java/util/EnumMap.java b/src/share/classes/java/util/EnumMap.java index 21be62d8d..7357ee381 100644 --- a/src/share/classes/java/util/EnumMap.java +++ b/src/share/classes/java/util/EnumMap.java @@ -367,7 +367,7 @@ public class EnumMap, V> extends AbstractMap * view the first time this view is requested. The view is stateless, * so there's no reason to create more than one. */ - private transient Set> entrySet = null; + private transient Set> entrySet; /** * Returns a {@link Set} view of the keys contained in this map. @@ -562,7 +562,7 @@ public class EnumMap, V> extends AbstractMap } private class EntryIterator extends EnumMapIterator> { - private Entry lastReturnedEntry = null; + private Entry lastReturnedEntry; public Map.Entry next() { if (!hasNext()) diff --git a/src/share/classes/java/util/Hashtable.java b/src/share/classes/java/util/Hashtable.java index b97a8e361..6ee87cbb3 100644 --- a/src/share/classes/java/util/Hashtable.java +++ b/src/share/classes/java/util/Hashtable.java @@ -617,9 +617,9 @@ public class Hashtable * appropriate view the first time this view is requested. The views are * stateless, so there's no reason to create more than one of each. */ - private transient volatile Set keySet = null; - private transient volatile Set> entrySet = null; - private transient volatile Collection values = null; + private transient volatile Set keySet; + private transient volatile Set> entrySet; + private transient volatile Collection values; /** * Returns a {@link Set} view of the keys contained in this map. @@ -1303,8 +1303,8 @@ public class Hashtable private class Enumerator implements Enumeration, Iterator { Entry[] table = Hashtable.this.table; int index = table.length; - Entry entry = null; - Entry lastReturned = null; + Entry entry; + Entry lastReturned; int type; /** diff --git a/src/share/classes/java/util/IdentityHashMap.java b/src/share/classes/java/util/IdentityHashMap.java index 3db40588d..6e50f8a46 100644 --- a/src/share/classes/java/util/IdentityHashMap.java +++ b/src/share/classes/java/util/IdentityHashMap.java @@ -842,7 +842,7 @@ public class IdentityHashMap private class EntryIterator extends IdentityHashMapIterator> { - private Entry lastReturnedEntry = null; + private Entry lastReturnedEntry; public Map.Entry next() { lastReturnedEntry = new Entry(nextIndex()); @@ -928,7 +928,7 @@ public class IdentityHashMap * view the first time this view is requested. The view is stateless, * so there's no reason to create more than one. */ - private transient Set> entrySet = null; + private transient Set> entrySet; /** * Returns an identity-based set view of the keys contained in this map. diff --git a/src/share/classes/java/util/LinkedList.java b/src/share/classes/java/util/LinkedList.java index 6c0626b43..60f4c414b 100644 --- a/src/share/classes/java/util/LinkedList.java +++ b/src/share/classes/java/util/LinkedList.java @@ -869,7 +869,7 @@ public class LinkedList } private class ListItr implements ListIterator { - private Node lastReturned = null; + private Node lastReturned; private Node next; private int nextIndex; private int expectedModCount = modCount; diff --git a/src/share/classes/java/util/TreeMap.java b/src/share/classes/java/util/TreeMap.java index 6a3ecc00b..14a34e29b 100644 --- a/src/share/classes/java/util/TreeMap.java +++ b/src/share/classes/java/util/TreeMap.java @@ -120,7 +120,7 @@ public class TreeMap */ private final Comparator comparator; - private transient Entry root = null; + private transient Entry root; /** * The number of entries in the tree @@ -784,9 +784,9 @@ public class TreeMap * the first time this view is requested. Views are stateless, so * there's no reason to create more than one. */ - private transient EntrySet entrySet = null; - private transient KeySet navigableKeySet = null; - private transient NavigableMap descendingMap = null; + private transient EntrySet entrySet; + private transient KeySet navigableKeySet; + private transient NavigableMap descendingMap; /** * Returns a {@link Set} view of the keys contained in this map. @@ -1585,9 +1585,9 @@ public class TreeMap } // Views - transient NavigableMap descendingMapView = null; - transient EntrySetView entrySetView = null; - transient KeySet navigableKeySetView = null; + transient NavigableMap descendingMapView; + transient EntrySetView entrySetView; + transient KeySet navigableKeySetView; public final NavigableSet navigableKeySet() { KeySet nksv = navigableKeySetView; @@ -2048,8 +2048,8 @@ public class TreeMap static final class Entry implements Map.Entry { K key; V value; - Entry left = null; - Entry right = null; + Entry left; + Entry right; Entry parent; boolean color = BLACK; diff --git a/src/share/classes/java/util/WeakHashMap.java b/src/share/classes/java/util/WeakHashMap.java index 81f74be8e..9805f83ce 100644 --- a/src/share/classes/java/util/WeakHashMap.java +++ b/src/share/classes/java/util/WeakHashMap.java @@ -759,21 +759,21 @@ public class WeakHashMap private abstract class HashIterator implements Iterator { private int index; - private Entry entry = null; - private Entry lastReturned = null; + private Entry entry; + private Entry lastReturned; private int expectedModCount = modCount; /** * Strong reference needed to avoid disappearance of key * between hasNext and next */ - private Object nextKey = null; + private Object nextKey; /** * Strong reference needed to avoid disappearance of key * between nextEntry() and any use of the entry */ - private Object currentKey = null; + private Object currentKey; HashIterator() { index = isEmpty() ? 0 : table.length; @@ -848,7 +848,7 @@ public class WeakHashMap // Views - private transient Set> entrySet = null; + private transient Set> entrySet; /** * Returns a {@link Set} view of the keys contained in this map. -- GitLab