Tal Nisan has uploaded a new change for review.
Change subject: restapi: Fix NPE on Jboss startup
......................................................................
restapi: Fix NPE on Jboss startup
Fixed an NPE on Jboss startup caused by trying to get the wrong key from
the stats map, the name was changed along with the StorageDomain entity name
change but was supposed to remain the same since the stat name is hardcoded
in GetSystemStatisticsQuery
Change-Id: I66643eb750dd1f7d7054db387a24a843b211a7c5
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/12102/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
index ba0ea55cf..4791e79 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
@@ -416,8 +416,8 @@
summary.getUsers().setActive(get(stats, "active_users"));
summary.setStorageDomains(new StorageDomains());
- summary.getStorageDomains().setTotal(get(stats,
"total_org.ovirt.engine.core.common.businessentities.StorageDomain"));
- summary.getStorageDomains().setActive(get(stats,
"active_org.ovirt.engine.core.common.businessentities.StorageDomain"));
+ summary.getStorageDomains().setTotal(get(stats,
"total_storage_domains"));
+ summary.getStorageDomains().setActive(get(stats,
"active_storage_domains"));
api.setSummary(summary);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
index 3953414..d5f5070 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
@@ -275,8 +275,8 @@
stats.put("active_vds", ACTIVE_HOSTS);
stats.put("total_users", TOTAL_USERS);
stats.put("active_users", ACTIVE_USERS);
-
stats.put("total_org.ovirt.engine.core.common.businessentities.StorageDomain",
TOTAL_STORAGE_DOMAINS);
-
stats.put("active_org.ovirt.engine.core.common.businessentities.StorageDomain",
ACTIVE_STORAGE_DOMAINS);
+ stats.put("total_storage_domains", TOTAL_STORAGE_DOMAINS);
+ stats.put("active_storage_domains", ACTIVE_STORAGE_DOMAINS);
return stats;
}
--
To view, visit http://gerrit.ovirt.org/12102
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66643eb750dd1f7d7054db387a24a843b211a7c5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
