Skip to content

Commit 28fdb2e

Browse files
committed
server: fix NPE when router.service.offering is set due to service/disk offering refactoring
1 parent b296546 commit 28fdb2e

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.cloud.network.vpc.dao.VpcOfferingDao;
4848
import com.cloud.offerings.dao.NetworkOfferingDao;
4949
import com.cloud.service.dao.ServiceOfferingDao;
50+
import com.cloud.storage.dao.DiskOfferingDao;
5051
import com.cloud.user.Account;
5152
import com.cloud.user.AccountManager;
5253
import com.cloud.vm.DomainRouterVO;
@@ -72,6 +73,8 @@ public class RouterDeploymentDefinitionBuilder {
7273
@Inject
7374
private ServiceOfferingDao serviceOfferingDao;
7475
@Inject
76+
private DiskOfferingDao diskOfferingDao;
77+
@Inject
7578
private IpAddressManager ipAddrMgr;
7679
@Inject
7780
private VMInstanceDao vmDao;
@@ -127,6 +130,7 @@ protected RouterDeploymentDefinition injectDependencies(
127130
routerDeploymentDefinition.vrProviderDao = vrProviderDao;
128131
routerDeploymentDefinition.networkOfferingDao = networkOfferingDao;
129132
routerDeploymentDefinition.serviceOfferingDao = serviceOfferingDao;
133+
routerDeploymentDefinition.diskOfferingDao = diskOfferingDao;
130134
routerDeploymentDefinition.ipAddrMgr = ipAddrMgr;
131135
routerDeploymentDefinition.vmDao = vmDao;
132136
routerDeploymentDefinition.podDao = podDao;

0 commit comments

Comments
 (0)