Skip to content

Commit 51d002d

Browse files
Removed duplicate network state checks before shutdown network
1 parent 6d916ca commit 51d002d

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,13 +3018,8 @@ protected void checkL2OfferingServices(NetworkOfferingVO ntwkOff) {
30183018
@DB
30193019
public boolean shutdownNetwork(final long networkId, final ReservationContext context, final boolean cleanupElements) {
30203020
NetworkVO network = _networksDao.findById(networkId);
3021-
if (network.getState() == Network.State.Allocated) {
3022-
s_logger.debug("Network is already shutdown: " + network);
3023-
return true;
3024-
}
3025-
3026-
if (network.getState() != Network.State.Implemented && network.getState() != Network.State.Shutdown) {
3027-
s_logger.debug("Network is not implemented: " + network);
3021+
if (network == null) {
3022+
s_logger.debug("Network with id: " + networkId + " doesn't exists");
30283023
return false;
30293024
}
30303025

0 commit comments

Comments
 (0)