From: Giovanni Meo Date: Tue, 28 May 2013 18:19:25 +0000 (+0000) Subject: Merge "Fixed whitespace for Gerrit 393" X-Git-Tag: releasepom-0.1.0~418 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=699f2b3912b8cfae054c08f6f9af7e0061afce57;hp=d0f1a6162437a9e003e87c7a8b36ea875f8de984 Merge "Fixed whitespace for Gerrit 393" --- 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 fd37b84d7a..6e625a0eb7 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 @@ -98,7 +98,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { this.hostTracker = null; } } - + public void setTopologyManager(ITopologyManager tm) { this.topologyManager = tm; } @@ -242,7 +242,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { generateAndSendReply(sourceIP, sourceMAC); return; } - + /* * ARP Request Handling: * If targetIP is the IP of the subnet, reply with ARP REPLY @@ -321,9 +321,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { nodeConnectors = subnet.getNodeConnectors(); } for (NodeConnector p : nodeConnectors) { - if (topologyManager.isInternal(p)) { - continue; - } + if (topologyManager.isInternal(p)) { + continue; + } ARP arp = new ARP(); byte[] senderIP = subnet.getNetworkAddress().getAddress(); byte[] targetIPB = targetIP.getAddress(); @@ -552,7 +552,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { } return PacketResult.IGNORED; } - + private void startPeriodicTimer() { this.periodicTimer = new Timer("ArpHandler Periodic Timer"); this.periodicTimer.scheduleAtFixedRate(new TimerTask() {