Little issue correction to allow transaction with currency at 0

ub · ub · commit 8ff523b9a560 · 2018-10-30T17:20:52.000+01:00
diff --git a/src/main/java/multichain/object/queryobjects/RawParam.java b/src/main/java/multichain/object/queryobjects/RawParam.java
@@ -15,11 +15,11 @@
 
 /**
  * @author Ub - H. MARTEAU
- * @version 4.7
+ * @version 4.17 
  */
 public class RawParam extends GsonFormatters {
 	String address;
-	float amount = 0;
+	float amount = -1;
 	List<AssetQuantity> assets;
 
 	/**
@@ -48,7 +48,7 @@ public boolean isFilled() {
 		if (address == null || "".equals(address)) {
 			return false;
 		}
-		if (amount != 0.0) {
+		if (amount >= 0) {
 			return true;
 		} else {
 			if (assets == null || assets.size() == 0) {
@@ -64,18 +64,18 @@ public boolean isFilled() {
 	}
 
 	public Object getValue() {
-		if (amount != 0.0) {
-			return amount;
-		} else {
-			Map<String, Float> filledAssets = new HashMap<String, Float>();
-			if (assets != null && assets.size() != 0) {
-				for (AssetQuantity asset : assets) {
-					if (asset.isFilled()) {
-						filledAssets.put(asset.getName(), new Float(asset.getQuantity()));
-					}
+		Map<String, Float> filledAssets = new HashMap<String, Float>();
+		if (assets != null && assets.size() != 0) {
+			for (AssetQuantity asset : assets) {
+				if (asset.isFilled()) {
+					filledAssets.put(asset.getName(), new Float(asset.getQuantity()));
 				}
 			}
+		}
+		if (filledAssets.size() > 0) {
 			return filledAssets;
+		} else {
+		  return amount;
 		}
 	}
 
