commit c2da488013b6011c138cb26c57536232c4c22492
author Simon Hunt <simon@onlab.us> Thu Jan 21 13:24:47 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Jan 21 23:28:30 2016 +0000
tree 8648706b2a67c81dcd344d730ea5c7f6b9efccf1
parent 97d6b2d39238e032acbbc70b94c0f92819b69621

Harden DefaultApplication against modification.

Change-Id: I3342e4961096a49ad9761952d73b4a08ea0eebeb

core/api/src/main/java/org/onosproject/core/DefaultApplication.java

diff --git a/core/api/src/main/java/org/onosproject/core/DefaultApplication.java b/core/api/src/main/java/org/onosproject/core/DefaultApplication.java
index 5ce5ee7..7737ef8 100644
--- a/core/api/src/main/java/org/onosproject/core/DefaultApplication.java
+++ b/core/api/src/main/java/org/onosproject/core/DefaultApplication.java
@@ -15,6 +15,8 @@
  */
 package org.onosproject.core;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import org.onosproject.security.Permission;
 
 import java.net.URI;
@@ -76,12 +78,18 @@
         this.category = checkNotNull(category, "Category cannot be null");
         this.url = url;
         this.readme = checkNotNull(readme, "Readme cannot be null");
-        this.icon = icon;
+        this.icon = icon == null ? new byte[0] : icon.clone();
         this.role = checkNotNull(role, "Role cannot be null");
-        this.permissions = checkNotNull(permissions, "Permissions cannot be null");
+        this.permissions = ImmutableSet.copyOf(
+                checkNotNull(permissions, "Permissions cannot be null")
+        );
         this.featuresRepo = checkNotNull(featuresRepo, "Features repo cannot be null");
-        this.features = checkNotNull(features, "Features cannot be null");
-        this.requiredApps = checkNotNull(requiredApps, "Required apps cannot be null");
+        this.features = ImmutableList.copyOf(
+                checkNotNull(features, "Features cannot be null")
+        );
+        this.requiredApps = ImmutableList.copyOf(
+                checkNotNull(requiredApps, "Required apps cannot be null")
+        );
         checkArgument(!features.isEmpty(), "There must be at least one feature");
     }
 
@@ -117,7 +125,7 @@
 
     @Override
     public byte[] icon() {
-        return icon;
+        return icon.clone();
     }
 
     @Override