| Chunk |
|---|
| Conflicting content |
|---|
return count;
}
<<<<<<< HEAD
public int countVmsByPrefix(final String prefix) throws VSphereException {
int count = 0;
try {
final InventoryNavigator navigator = new InventoryNavigator(getServiceInstance().getRootFolder());
final ManagedEntity[] entities = navigator.searchManagedEntities(false);
for(final ManagedEntity entity : entities) {
if(entity.getName().startsWith(prefix)) {
++count;
}
}
} catch (Exception ex) {
throw new VSphereException(ex);
}
return count;
}
=======
>>>>>>> aa343842fd7ee5a50698c399b9e215e14f5d644f
private Datastore getDatastoreByName(final String datastoreName, ManagedEntity rootEntity) throws RemoteException, MalformedURLException {
if (rootEntity == null) {
rootEntity = getServiceInstance().getRootFolder(); |
| Solution content |
|---|
return count;
}
<<<<<<< HEAD
public int countVmsByPrefix(final String prefix) throws VSphereException {
int count = 0;
try {
final InventoryNavigator navigator = new InventoryNavigator(getServiceInstance().getRootFolder());
final ManagedEntity[] entities = navigator.searchManagedEntities(false);
for(final ManagedEntity entity : entities) {
if(entity.getName().startsWith(prefix)) {
++count;
}
}
} catch (Exception ex) {
throw new VSphereException(ex);
}
return count;
}
=======
>>>>>>> aa343842fd7ee5a50698c399b9e215e14f5d644f
private Datastore getDatastoreByName(final String datastoreName, ManagedEntity rootEntity) throws RemoteException, MalformedURLException {
if (rootEntity == null) {
rootEntity = getServiceInstance().getRootFolder(); |
| File |
|---|
| VSphere.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method declaration |