Alexander Wels has uploaded a new change for review.
Change subject: webadmin: storage main tab 500
......................................................................
webadmin: storage main tab 500
- Due to the hibernate collection to java collection conversion
the getWarningLowSpaceSize method was being called while some of
the information was missing causing null pointer exceptions. This
patch fixed that problem.
Change-Id: Iaf6fe9c3e5c83944753eb16b750a565f1f110572
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/42095/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
index 0ea988e..2afea36 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
@@ -140,7 +140,7 @@
}
public Integer getWarningLowSpaceIndicator() {
- return staticData.getWarningLowSpaceIndicator();
+ return staticData == null ? null :
staticData.getWarningLowSpaceIndicator();
}
public void setWarningLowSpaceIndicator(Integer warningLowSpaceIndicator) {
@@ -148,7 +148,8 @@
}
public int getWarningLowSpaceSize() {
- return getWarningLowSpaceIndicator() == null ? 0 : getTotalDiskSize()
* getWarningLowSpaceIndicator() / 100;
+ return getWarningLowSpaceIndicator() == null || getTotalDiskSize() ==
null ?
+ 0 : getTotalDiskSize() * getWarningLowSpaceIndicator() / 100;
}
public Integer getCriticalSpaceActionBlocker() {
@@ -217,8 +218,8 @@
}
private void UpdateTotalDiskSize() {
- Integer available = getStorageDynamicData().getAvailableDiskSize();
- Integer used = getStorageDynamicData().getUsedDiskSize();
+ Integer available = getStorageDynamicData() == null ? null :
getStorageDynamicData().getAvailableDiskSize();
+ Integer used = getStorageDynamicData() == null ? null :
getStorageDynamicData().getUsedDiskSize();
if (available != null && used != null) {
setTotalDiskSize(available + used);
--
To view, visit https://gerrit.ovirt.org/42095
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf6fe9c3e5c83944753eb16b750a565f1f110572
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
