From: Anisha Kumar <anishax.kumar@intel.com>
Date: Mon, 6 Aug 2018 22:16:28 +0000 (-0700)
Subject: Change & to &&
X-Git-Tag: 1.3.1~304^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e8297045eb382a4a3b917e3e89ec431209f84354;p=so.git

Change & to &&

The boolean expression on line 243 requires two "&"
instead of one.

Issue-ID: SO-666
Change-Id: I3965119a223063e9bcee8a5ca807791b41f63410
Signed-off-by: Anisha Kumar <anishax.kumar@intel.com>
---

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
index a1501da0e2..ee8f503e42 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
@@ -240,7 +240,7 @@ public class NetworkAdapterObjectMapper {
 		for (org.onap.so.bpmn.servicedecomposition.bbobjects.Subnet subnet : subnets) {
 			org.onap.so.openstack.beans.Subnet openstackSubnet = modelMapper.map(subnet, org.onap.so.openstack.beans.Subnet.class);
 			//update cidr value
-			if (subnet.getNetworkStartAddress() != null & subnet.getCidrMask() != null)
+			if (subnet.getNetworkStartAddress() != null && subnet.getCidrMask() != null)
 				openstackSubnet.setCidr(subnet.getNetworkStartAddress().concat(FORWARD_SLASH).concat(subnet.getCidrMask()));
 			List<org.onap.so.bpmn.servicedecomposition.bbobjects.HostRoute> hostRouteList = subnet.getHostRoutes();
 			List<org.onap.so.openstack.beans.HostRoute> openstackHostRouteList = new ArrayList<>();