Added null checks to SWGMap

This commit is contained in:
Treeku
2014-06-05 20:48:20 +01:00
parent cfc0f8653e
commit 0ce678cb9e
+8 -15
View File
@@ -194,21 +194,14 @@ public class SWGMap<K, V> implements Map<K, V>, Serializable {
K key = entry.getKey();
V value = entry.getValue();
if (valid(key) && valid(value))
{
if (map.containsKey(key))
{
if (map.put(key, value) != null)
{
buffer.add(item(2, key, Baseline.toBytes(value), true, true));
}
}
else
{
if(map.put(key, value) == null)
{
buffer.add(item(0, key, Baseline.toBytes(value), true, true));
}
if (key != null && valid(key) && value != null && valid(value)) {
if (map.containsKey(key)) {
map.put(key, value);
buffer.add(item(2, key, Baseline.toBytes(value), true, true));
} else {
map.put(key, value);
buffer.add(item(0, key, Baseline.toBytes(value), true, true));
}
}
}