From: Alessandro Boch <aboch@cisco.com>
Date: Thu, 10 Oct 2013 16:00:49 +0000 (-0700)
Subject: Make use of NetUtils.getBroadcastMacAddr()
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~642
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9438cd96bbebb06f5b67c81f313eacd6e382f0d7;hp=be618d182f8cb0b7e9eb780da5cf822d3ce4b0b2

Make use of NetUtils.getBroadcastMacAddr()

    ISSUE: I suggested to make NetUtils.broadcastMacAddr public, but that was no
           a good idea as we already have the getter and because that is an arra
           therefore vulnerable to modifications.

Change-Id: I098ca828d79ffe1d478c761d8b749ee100dfba5b
Signed-off-by: Alessandro Boch <aboch@cisco.com>
---

diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
index 4ff44fdab8..e345d65f7e 100644
--- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
+++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
@@ -345,7 +345,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA
             byte[] targetIPByte = targetIP.getAddress();
             ARP arp = createARP(ARP.REQUEST, getControllerMAC(), senderIP, targetHardwareAddress, targetIPByte);
 
-            byte[] destMACAddress = NetUtils.BroadcastMACAddr;
+            byte[] destMACAddress = NetUtils.getBroadcastMACAddr();
             Ethernet ethernet = createEthernet(getControllerMAC(), destMACAddress, arp);
 
             // TODO For now send port-by-port, see how to optimize to
diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
index 1ced9dd9e4..6c3424c616 100644
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
@@ -43,7 +43,7 @@ public abstract class NetUtils {
     /**
      * Constant holding the broadcast MAC address
      */
-    public static final byte[] BroadcastMACAddr = {-1, -1, -1, -1, -1, -1};
+    private static final byte[] BroadcastMACAddr = {-1, -1, -1, -1, -1, -1};
 
     /**
      * Converts a 4 bytes array into an integer number
@@ -515,7 +515,7 @@ public abstract class NetUtils {
     /**
      * Returns Broadcast MAC Address
      *
-     * @return the byte array containing  broadcaset mac address
+     * @return the byte array containing  broadcast mac address
      */
     public static byte[] getBroadcastMACAddr() {
         return Arrays.copyOf(BroadcastMACAddr, BroadcastMACAddr.length);