java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
| 25 +++++++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
| 4 -
2 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 5634080ad94668c3b1e73262df011d30715c1f26
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Sep 22 18:21:03 2010 -0400
636120-Fixed an ISE in the org.listSystemEntitlements call to deal with null
Used/Allocated entitlements
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
index 79797e9..b40b4b0 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
@@ -93,6 +93,17 @@ public class MultiOrgEntitlementsDto extends BaseDto {
/**
+ * @return the free
+ */
+ public Long getFree() {
+ if (getUsed() == null) {
+ getAllocated();
+ }
+
+ return getAllocated() - getUsed();
+ }
+
+ /**
* @return the ratio of current: allocated
*/
public BigDecimal getRatio() {
@@ -201,7 +212,7 @@ public class MultiOrgEntitlementsDto extends BaseDto {
* @return the number of used slots.
*/
public Long getAllocatedFlex() {
- if (getTotal() == null || getAvailable() == null) {
+ if (getTotalFlex() == null || getAvailableFlex() == null) {
return 0L;
}
return getTotalFlex() - getAvailableFlex();
@@ -219,4 +230,16 @@ public class MultiOrgEntitlementsDto extends BaseDto {
}
return BigDecimal.ZERO;
}
+
+ /**
+ * @return the free flex
+ */
+ public Long getFreeFlex() {
+ if (getUsedFlex() == null) {
+ return getAllocatedFlex();
+ }
+
+ return getAllocatedFlex() - getUsedFlex();
+ }
+
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
index 9c54f87..07359c8 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
@@ -66,11 +66,11 @@ public class MultiOrgEntitlementsDtoSerializer implements
helper.add("allocated", dto.getAllocated());
helper.add("unallocated", dto.getAvailable());
helper.add("used", dto.getUsed());
- helper.add("free", dto.getAllocated() - dto.getUsed());
+ helper.add("free", dto.getFree());
helper.add("allocated_flex", dto.getAllocatedFlex());
helper.add("unallocated_flex", dto.getAvailableFlex());
helper.add("used_flex", dto.getUsedFlex());
- helper.add("free_flex", dto.getAllocatedFlex() - dto.getUsedFlex());
+ helper.add("free_flex", dto.getFreeFlex());
helper.writeTo(output);
}
Show replies by date