commit 92cd34fcaec3f703073348bd483d92f21ac39766
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Sep 03 10:29:30 2015 -0700
committer Ray Milkey <ray@onlab.us> Thu Sep 03 18:36:00 2015 +0000
tree 876a5d99cea7802141a7415d328b59e20c035585
parent e81e4dbd8e2789fb6744481a92d6e608baa1cf8e

Replace redundant instanceof with non-null check

Change-Id: Ib86b0c8561824b1753b299f680d7d336205dd9a4

pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java

diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
index 60d4af9..5b47f53 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
@@ -252,7 +252,7 @@
 
                 //Srp Object is mandatory
                 PcepSrpObject srpObj = listReq.getSrpObject();
-                if (srpObj instanceof PcepSrpObject) {
+                if (srpObj != null) {
                     isDelLspRequest = srpObj.getRFlag();
                     srpObj.write(cb);
                 } else {
@@ -261,7 +261,7 @@
 
                 //LSP Object is mandatory
                 PcepLspObject lspObj = listReq.getLspObject();
-                if (lspObj instanceof PcepLspObject) {
+                if (lspObj != null) {
                     lspObj.write(cb);
                 } else {
                     throw new PcepParseException("LSP Object is mandatory for PcInitiate message.");
@@ -275,7 +275,7 @@
 
                     //EndPoints object is mandatory
                     PcepEndPointsObject endPointObj = listReq.getEndPointsObject();
-                    if (endPointObj instanceof PcepEndPointsObject) {
+                    if (endPointObj != null) {
                         endPointObj.write(cb);
                     } else {
                         throw new PcepParseException("End points Object is mandatory for PcInitiate message.");
@@ -283,7 +283,7 @@
 
                     //Ero object is mandatory
                     PcepEroObject eroObj = listReq.getEroObject();
-                    if (eroObj instanceof PcepEroObject) {
+                    if (eroObj != null) {
                         eroObj.write(cb);
                     } else {
                         throw new PcepParseException("ERO Object is mandatory for PcInitiate message.");
@@ -291,7 +291,7 @@
 
                     //PcepAttribute is optional
                     PcepAttribute pcepAttribute = listReq.getPcepAttribute();
-                    if (pcepAttribute instanceof PcepAttribute) {
+                    if (pcepAttribute != null) {
                         pcepAttribute.write(cb);
                     }
                 }