commit aa48da8d16bf099e199e59f81bdd8dd44e6baa93
author sunish vk <sunish.vk@cognizant.com> Wed Mar 02 23:17:06 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 03 00:50:38 2016 +0000
tree 9c4dffbf06a30d9b2de40d39dbecdea6f8ce6e30
parent 156c480cf10f75d53f475331f1ade40ae7226d32

Fixed pom.xml issues and build issues. Corrected checkstyle issues

Change-Id: I90744f53e40f417ffe7ae62ffe138eea7a489bc0

protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfInterfaceChannelHandler.java

diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfInterfaceChannelHandler.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfInterfaceChannelHandler.java
index aac1322..3bb5dce 100755
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfInterfaceChannelHandler.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfInterfaceChannelHandler.java
@@ -258,7 +258,7 @@
             log.debug("OspfChannelHandler::List of OspfMessages Size {}", ospfMessageList.size());
             if (ospfMessageList != null) {
                 for (OspfMessage ospfMessage : ospfMessageList) {
-                    processOSPFMessage(ospfMessage, ctx);
+                    processOspfMessage(ospfMessage, ctx);
                 }
             } else {
                 log.debug("OspfChannelHandler::OspfMessages Null List...!!");
@@ -267,7 +267,7 @@
         if (message instanceof OspfMessage) {
             OspfMessage ospfMessage = (OspfMessage) message;
             log.debug("OspfChannelHandler::OspfMessages received...!!");
-            processOSPFMessage(ospfMessage, ctx);
+            processOspfMessage(ospfMessage, ctx);
         }
     }
 
@@ -280,8 +280,8 @@
      * @param ctx         channel handler context instance.
      * @throws Exception might throws exception
      */
-    public void processOSPFMessage(OspfMessage ospfMessage, ChannelHandlerContext ctx) throws Exception {
-        log.debug("OspfChannelHandler::processOSPFMessage...!!!");
+    public void processOspfMessage(OspfMessage ospfMessage, ChannelHandlerContext ctx) throws Exception {
+        log.debug("OspfChannelHandler::processOspfMessage...!!!");
 
         if (!validateMessage(ospfMessage)) {
             return;

protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java

diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java
index 0d284bf..77a0d53 100755
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java
@@ -1046,8 +1046,7 @@
 
         //If LSA type is external & the area is configured as stub area discard the lsa RFC 2328 13(3)
         if ((recLsa.getOspfLsaType() == OspfLsaType.EXTERNAL_LSA) &&
-                (!ospfArea.isExternalRoutingCapability())) // to determine how to store options
-        {
+                (!ospfArea.isExternalRoutingCapability())) {
             return true;
         }