commit 75edab7e7b3b7d31f611dca07910995d58506d7e
author Charles Chan <rascov@gmail.com> Tue Sep 12 17:09:32 2017 -0700
committer Charles Chan <charles@opennetworking.org> Wed Sep 13 02:55:24 2017 +0000
tree 72a99e8d2c71cbc10d7bbfe5dfd42d782558a62d
parent 4b013201105ff57da6979d2f9b4544fd73362822

Fix duplicated provider id

Change-Id: Ibfa2ec9fe609c2f48ccc5e796544986d84e96a60

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index 235b4c5..39e53ff 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -89,6 +89,8 @@
 @Service
 @Property(name = "version", value = "4")
 public class Dhcp4HandlerImpl implements DhcpHandler, HostProvider {
+    public static final String DHCP_V4_RELAY_APP = "org.onosproject.Dhcp4HandlerImpl";
+    public static final ProviderId PROVIDER_ID = new ProviderId("dhcp4", DHCP_V4_RELAY_APP);
     private static Logger log = LoggerFactory.getLogger(Dhcp4HandlerImpl.class);
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -1013,7 +1015,7 @@
 
     @Override
     public ProviderId id() {
-        return DhcpRelayManager.PROVIDER_ID;
+        return PROVIDER_ID;
     }
 
     class InternalHostListener implements HostListener {