commit 975617b709621208d5600f37a9195f0656547c6e
author alshabib <alshabibi.ali@gmail.com> Thu Apr 09 13:26:53 2015 -0700
committer alshabib <alshabibi.ali@gmail.com> Thu Apr 09 13:26:53 2015 -0700
tree 87f0a8fad0a354ed16e0f8e724f71e79c3909b18
parent 6a9d4e44473ff6b782c840d9012d9c11e0fc5c2a

ImmutableMap.Builder does not allow for duplicate keys, causes build() to fail.

Change-Id: I235ec0f802b3befbfa3e6338e8bd28814eb868c4

core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java

diff --git a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
index e7cd89e..4a176d7 100644
--- a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
+++ b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
@@ -16,6 +16,7 @@
 package org.onosproject.net.driver;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 
 import java.util.Map;
 import java.util.Set;
@@ -72,8 +73,8 @@
     @Override
     public Driver merge(Driver other) {
         // Merge the behaviours.
-        ImmutableMap.Builder<Class<? extends Behaviour>, Class<? extends Behaviour>>
-                behaviours = ImmutableMap.builder();
+        Map<Class<? extends Behaviour>, Class<? extends Behaviour>>
+                behaviours = Maps.newHashMap();
         behaviours.putAll(this.behaviours);
         other.behaviours().forEach(b -> behaviours.put(b, other.implementation(b)));
 
@@ -82,7 +83,7 @@
         properties.putAll(this.properties).putAll(other.properties());
 
         return new DefaultDriver(name, manufacturer, hwVersion, swVersion,
-                                 behaviours.build(), properties.build());
+                                 ImmutableMap.copyOf(behaviours), properties.build());
     }
 
     @Override