CLOUDSTACK-2456 usage:usage parser throws runtime exception while parsing networkoffering usage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7fef86c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7fef86c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7fef86c Branch: refs/heads/vmware-datamodel Commit: e7fef86c8086a3bad3a5f3aacaa39dd5ddef3ab4 Parents: e260817 Author: Mice Xia <mice_...@tcloudcomputing.com> Authored: Thu May 16 15:19:05 2013 +0800 Committer: Mice Xia <mice_...@tcloudcomputing.com> Committed: Thu May 16 15:19:05 2013 +0800 ---------------------------------------------------------------------- .../usage/dao/UsageNetworkOfferingDaoImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7fef86c/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index c3fc5a6..4ed7c27 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -118,18 +118,18 @@ public class UsageNetworkOfferingDaoImpl extends GenericDaoBase<UsageNetworkOffe ResultSet rs = pstmt.executeQuery(); while (rs.next()) { - //zoneId, account_id, domain_id, vm_instance_id, network_offering_id, is_default, created, deleted + //zoneId, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted Long zoneId = Long.valueOf(rs.getLong(1)); Long acctId = Long.valueOf(rs.getLong(2)); Long dId = Long.valueOf(rs.getLong(3)); long vmId = Long.valueOf(rs.getLong(4)); long noId = Long.valueOf(rs.getLong(5)); long nicId = Long.valueOf(rs.getLong(6)); - boolean isDefault = Boolean.valueOf(rs.getBoolean(6)); + boolean isDefault = Boolean.valueOf(rs.getBoolean(7)); Date createdDate = null; Date deletedDate = null; - String createdTS = rs.getString(7); - String deletedTS = rs.getString(8); + String createdTS = rs.getString(8); + String deletedTS = rs.getString(9); if (createdTS != null) {