stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8035284: Remove redundant null initialization

Browse Source 
Reviewed-by: lancea, martin, chegar, shade
This commit is contained in:
Mike Duigou 2014-04-11 14:07:25 -07:00
parent 9e71840a87
commit c78cb9b1c5
8 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/java/util/AbstractMap.java
View File

@ -305,8 +305,8 @@ public abstract class AbstractMap<K,V> implements Map<K,V> {
* appropriate view the first time this view is requested. The views are * 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. * stateless, so there's no reason to create more than one of each.
*/ */
transient volatile Set<K> keySet = null; transient volatile Set<K> keySet;
transient volatile Collection<V> values = null; transient volatile Collection<V> values;
/** /**
* {@inheritDoc} * {@inheritDoc}

22
jdk/src/share/classes/java/util/Collections.java
View File

@ -1466,9 +1466,9 @@ public class Collections {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
private transient Set<K> keySet = null; private transient Set<K> keySet;
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
private transient Collection<V> values = null; private transient Collection<V> values;
public Set<K> keySet() { public Set<K> keySet() {
if (keySet==null) if (keySet==null)
@ -2597,9 +2597,9 @@ public class Collections {
synchronized (mutex) {m.clear();} synchronized (mutex) {m.clear();}
} }
private transient Set<K> keySet = null; private transient Set<K> keySet;
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
private transient Collection<V> values = null; private transient Collection<V> values;
public Set<K> keySet() { public Set<K> keySet() {
synchronized (mutex) { synchronized (mutex) {
@ -3082,7 +3082,7 @@ public class Collections {
return c.add(e); return c.add(e);
} }
private E[] zeroLengthElementArray = null; // Lazily initialized private E[] zeroLengthElementArray; // Lazily initialized
private E[] zeroLengthElementArray() { private E[] zeroLengthElementArray() {
return zeroLengthElementArray != null ? zeroLengthElementArray : return zeroLengthElementArray != null ? zeroLengthElementArray :
@ -3643,7 +3643,7 @@ public class Collections {
m.put(e.getKey(), e.getValue()); m.put(e.getKey(), e.getValue());
} }
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
public Set<Map.Entry<K,V>> entrySet() { public Set<Map.Entry<K,V>> entrySet() {
if (entrySet==null) if (entrySet==null)
@ -4877,9 +4877,9 @@ public class Collections {
public boolean containsValue(Object value) {return eq(value, v);} public boolean containsValue(Object value) {return eq(value, v);}
public V get(Object key) {return (eq(key, k) ? v : null);} public V get(Object key) {return (eq(key, k) ? v : null);}
private transient Set<K> keySet = null; private transient Set<K> keySet;
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
private transient Collection<V> values = null; private transient Collection<V> values;
public Set<K> keySet() { public Set<K> keySet() {
if (keySet==null) if (keySet==null)

4
jdk/src/share/classes/java/util/EnumMap.java
View File

@ -367,7 +367,7 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V>
* view the first time this view is requested. The view is stateless, * view the first time this view is requested. The view is stateless,
* so there's no reason to create more than one. * so there's no reason to create more than one.
*/ */
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
/** /**
* Returns a {@link Set} view of the keys contained in this map. * Returns a {@link Set} view of the keys contained in this map.
@ -562,7 +562,7 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V>
} }
private class EntryIterator extends EnumMapIterator<Map.Entry<K,V>> { private class EntryIterator extends EnumMapIterator<Map.Entry<K,V>> {
private Entry lastReturnedEntry = null; private Entry lastReturnedEntry;
public Map.Entry<K,V> next() { public Map.Entry<K,V> next() {
if (!hasNext()) if (!hasNext())

10
jdk/src/share/classes/java/util/Hashtable.java
View File

@ -617,9 +617,9 @@ public class Hashtable<K,V>
* appropriate view the first time this view is requested. The views are * 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. * stateless, so there's no reason to create more than one of each.
*/ */
private transient volatile Set<K> keySet = null; private transient volatile Set<K> keySet;
private transient volatile Set<Map.Entry<K,V>> entrySet = null; private transient volatile Set<Map.Entry<K,V>> entrySet;
private transient volatile Collection<V> values = null; private transient volatile Collection<V> values;
/** /**
* Returns a {@link Set} view of the keys contained in this map. * Returns a {@link Set} view of the keys contained in this map.
@ -1300,8 +1300,8 @@ public class Hashtable<K,V>
private class Enumerator<T> implements Enumeration<T>, Iterator<T> { private class Enumerator<T> implements Enumeration<T>, Iterator<T> {
Entry<?,?>[] table = Hashtable.this.table; Entry<?,?>[] table = Hashtable.this.table;
int index = table.length; int index = table.length;
Entry<?,?> entry = null; Entry<?,?> entry;
Entry<?,?> lastReturned = null; Entry<?,?> lastReturned;
int type; int type;
/** /**

4
jdk/src/share/classes/java/util/IdentityHashMap.java
View File

@ -842,7 +842,7 @@ public class IdentityHashMap<K,V>
private class EntryIterator private class EntryIterator
extends IdentityHashMapIterator<Map.Entry<K,V>> extends IdentityHashMapIterator<Map.Entry<K,V>>
{ {
private Entry lastReturnedEntry = null; private Entry lastReturnedEntry;
public Map.Entry<K,V> next() { public Map.Entry<K,V> next() {
lastReturnedEntry = new Entry(nextIndex()); lastReturnedEntry = new Entry(nextIndex());
@ -928,7 +928,7 @@ public class IdentityHashMap<K,V>
* view the first time this view is requested. The view is stateless, * view the first time this view is requested. The view is stateless,
* so there's no reason to create more than one. * so there's no reason to create more than one.
*/ */
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
/** /**
* Returns an identity-based set view of the keys contained in this map. * Returns an identity-based set view of the keys contained in this map.

2
jdk/src/share/classes/java/util/LinkedList.java
View File

@ -869,7 +869,7 @@ public class LinkedList<E>
} }
private class ListItr implements ListIterator<E> { private class ListItr implements ListIterator<E> {
private Node<E> lastReturned = null; private Node<E> lastReturned;
private Node<E> next; private Node<E> next;
private int nextIndex; private int nextIndex;
private int expectedModCount = modCount; private int expectedModCount = modCount;

18
jdk/src/share/classes/java/util/TreeMap.java
View File

@ -120,7 +120,7 @@ public class TreeMap<K,V>
*/ */
private final Comparator<? super K> comparator; private final Comparator<? super K> comparator;
private transient Entry<K,V> root = null; private transient Entry<K,V> root;
/** /**
* The number of entries in the tree * The number of entries in the tree
@ -781,9 +781,9 @@ public class TreeMap<K,V>
* the first time this view is requested. Views are stateless, so * the first time this view is requested. Views are stateless, so
* there's no reason to create more than one. * there's no reason to create more than one.
*/ */
private transient EntrySet entrySet = null; private transient EntrySet entrySet;
private transient KeySet<K> navigableKeySet = null; private transient KeySet<K> navigableKeySet;
private transient NavigableMap<K,V> descendingMap = null; private transient NavigableMap<K,V> descendingMap;
/** /**
* Returns a {@link Set} view of the keys contained in this map. * Returns a {@link Set} view of the keys contained in this map.
@ -1583,9 +1583,9 @@ public class TreeMap<K,V>
} }
// Views // Views
transient NavigableMap<K,V> descendingMapView = null; transient NavigableMap<K,V> descendingMapView;
transient EntrySetView entrySetView = null; transient EntrySetView entrySetView;
transient KeySet<K> navigableKeySetView = null; transient KeySet<K> navigableKeySetView;
public final NavigableSet<K> navigableKeySet() { public final NavigableSet<K> navigableKeySet() {
KeySet<K> nksv = navigableKeySetView; KeySet<K> nksv = navigableKeySetView;
@ -2046,8 +2046,8 @@ public class TreeMap<K,V>
static final class Entry<K,V> implements Map.Entry<K,V> { static final class Entry<K,V> implements Map.Entry<K,V> {
K key; K key;
V value; V value;
Entry<K,V> left = null; Entry<K,V> left;
Entry<K,V> right = null; Entry<K,V> right;
Entry<K,V> parent; Entry<K,V> parent;
boolean color = BLACK; boolean color = BLACK;

10
jdk/src/share/classes/java/util/WeakHashMap.java
View File

@ -759,21 +759,21 @@ public class WeakHashMap<K,V>
private abstract class HashIterator<T> implements Iterator<T> { private abstract class HashIterator<T> implements Iterator<T> {
private int index; private int index;
private Entry<K,V> entry = null; private Entry<K,V> entry;
private Entry<K,V> lastReturned = null; private Entry<K,V> lastReturned;
private int expectedModCount = modCount; private int expectedModCount = modCount;
/** /**
* Strong reference needed to avoid disappearance of key * Strong reference needed to avoid disappearance of key
* between hasNext and next * between hasNext and next
*/ */
private Object nextKey = null; private Object nextKey;
/** /**
* Strong reference needed to avoid disappearance of key * Strong reference needed to avoid disappearance of key
* between nextEntry() and any use of the entry * between nextEntry() and any use of the entry
*/ */
private Object currentKey = null; private Object currentKey;
HashIterator() { HashIterator() {
index = isEmpty() ? 0 : table.length; index = isEmpty() ? 0 : table.length;
@ -848,7 +848,7 @@ public class WeakHashMap<K,V>
// Views // Views
private transient Set<Map.Entry<K,V>> entrySet = null; private transient Set<Map.Entry<K,V>> entrySet;
/** /**
* Returns a {@link Set} view of the keys contained in this map. * Returns a {@link Set} view of the keys contained in this map.