toVertex.property(GraphPropertyEnum.UNIQUE_ID.getProperty()));
result = JanusGraphOperationStatus.NOT_FOUND;
}
- if (result == null) {
+ if (result == null && org.apache.commons.collections4.IteratorUtils.isEmpty(prevEdgeIter)) {
result = replaceEdgeLabel(fromVertex, toVertex, prevEdgeIter.next(), prevLabel, newLabel);
}
return result;
result = StorageOperationStatus.NOT_FOUND;
}
}
- if (result == null) {
+ if (result == null && foundEdge!=null) {
JanusGraphOperationStatus
createEdgeRes = janusGraphDao
.createEdge(foundEdge.outVertex(), certifiedToscaElement.getVertex(), EdgeLabelEnum.LAST_STATE, foundEdge);
} else if (!vendorName.equals(other.vendorName)) {
return false;
}
- if (vendorRelease == null) {
- if (other.vendorRelease != null) {
+ if (vendorRelease == null && other.vendorRelease != null) {
return false;
- }
}
if (toscaResourceName == null) {
if (other.toscaResourceName != null) {
return false;
}
- } else if (!vendorRelease.equals(other.vendorRelease)) {
+ } else if (vendorRelease!=null && !vendorRelease.equals(other.vendorRelease)) {
return false;
}
if (resourceVendorModelNumber == null) {