commit 9827a350a918571396e6f230732aa336cae52c9f
author Yuta HIGUCHI <y-higuchi@onlab.us> Sun Sep 21 17:01:29 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Sun Sep 21 23:38:21 2014 -0700
tree ce5e6f79059d186683b31411b594dc18e419b9a7
parent 4e9c37ca39df963f3f79c854cfdf3474a2f4cee1

DefaultPort

- avoid null and use emptySet
- Copy given IpAddress Set to make this instance immutable

Change-Id: I55e8f6700ce2bc2883848c26947e6422bc72e1bc

core/api/src/main/java/org/onlab/onos/net/DefaultPort.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultPort.java b/core/api/src/main/java/org/onlab/onos/net/DefaultPort.java
index d2570b6..375becd 100644
--- a/core/api/src/main/java/org/onlab/onos/net/DefaultPort.java
+++ b/core/api/src/main/java/org/onlab/onos/net/DefaultPort.java
@@ -8,6 +8,8 @@
 
 import org.onlab.packet.IpPrefix;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * Default port implementation.
  */
@@ -45,8 +47,8 @@
         this.element = element;
         this.number = number;
         this.isEnabled = isEnabled;
-        this.ipAddresses = (ipAddresses == null) ? null :
-            Collections.unmodifiableSet(ipAddresses);
+        this.ipAddresses = (ipAddresses == null) ? Collections.<IpPrefix>emptySet() :
+            ImmutableSet.copyOf(ipAddresses);
     }
 
     @Override