[Engine-patches] Change in ovirt-engine[master]: core: Fixing some issues at SizeConverter

[yzaslavs]

Yair Zaslavsky has uploaded a new change for review.

Change subject: core: Fixing some issues at SizeConverter
......................................................................

core: Fixing some issues at SizeConverter

Fixing some issues reported by coverity

Change-Id: Ib8115b1ccc18d199a9a31416e44923d9d05758c6
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/21935/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
index 6cd199a..4138cb9 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
@@ -1,5 +1,6 @@
 package org.ovirt.engine.core.common.utils;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -53,17 +54,22 @@
         return (size) * ((Math.pow(CONVERT_FACTOR, fromType)) / 
(Math.pow(CONVERT_FACTOR, toType)));
     }
 
-    public static Pair<SizeUnit, Double> autoConvert(long size, SizeUnit 
inUnit) {
+    public static Pair<SizeUnit, Double> autoConvert(Long size, SizeUnit 
inUnit) {
         for (Pair<Long, SizeUnit> currentUnitPair : SizeUnit.weightToUnit) {
-            if (size / Math.pow(CONVERT_FACTOR, currentUnitPair.getFirst() - 
inUnit.getUnitWeight()) >= 1) {
+            if (size.longValue() / Math.pow(CONVERT_FACTOR, 
currentUnitPair.getFirst() - inUnit.getUnitWeight()) >= 1) {
                 return new Pair<SizeConverter.SizeUnit, 
Double>(currentUnitPair.getSecond(),
                         Double.valueOf(SizeConverter.convert(size, inUnit, 
currentUnitPair.getSecond()).doubleValue()));
             }
         }
-        return new Pair<SizeConverter.SizeUnit, Double>(SizeUnit.BYTES, new 
Double(new Long(size)));
+        return new Pair<SizeConverter.SizeUnit, Double>(SizeUnit.BYTES, 
size.doubleValue());
     }
 
-    private static class CompareUnits implements Comparator<Pair<Long, 
SizeUnit>> {
+    private static class CompareUnits implements Comparator<Pair<Long, 
SizeUnit>>, Serializable {
+
+        /**
+         * 
+         */
+        private static final long serialVersionUID = -659222322712056953L;
 
         @Override
         public int compare(Pair<Long, SizeUnit> unit1, Pair<Long, SizeUnit> 
unit2) {


-- 
To view, visit http://gerrit.ovirt.org/21935
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8115b1ccc18d199a9a31416e44923d9d05758c6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches