Skip to content

Commit 399b023

Browse files
committed
Fix null on putAll
1 parent 62f8d27 commit 399b023

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
import java.util.List;
6161
import java.util.Map;
62+
import java.util.Optional;
6263

6364
public class DefaultHostListener implements HypervisorHostListener {
6465
protected Logger logger = LogManager.getLogger(getClass());
@@ -133,8 +134,9 @@ private NicTO createNicTOFromNetworkAndOffering(NetworkVO networkVO, NetworkOffe
133134
public boolean hostConnect(long hostId, long poolId) throws StorageConflictException {
134135
StoragePool pool = (StoragePool) this.dataStoreMgr.getDataStore(poolId, DataStoreRole.Primary);
135136
Map<String, String> detailsMap = storagePoolDetailsDao.listDetailsKeyPairs(poolId);
136-
detailsMap.putAll(storageManager.getStoragePoolNFSMountOpts(pool, null).first());
137+
Map<String, String> nfsMountOpts = storageManager.getStoragePoolNFSMountOpts(pool, null).first();
137138

139+
Optional.ofNullable(nfsMountOpts).ifPresent(detailsMap::putAll);
138140
ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool, detailsMap);
139141
cmd.setWait(modifyStoragePoolCommandWait);
140142
HostVO host = hostDao.findById(hostId);

0 commit comments

Comments
 (0)