1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueDuration.java b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueDuration.java
index 7a74776..ad14a30 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueDuration.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueDuration.java
@@ -264,9 +264,9 @@ public class ValueDuration extends ValueSimple<Long> {
         remainingUnits /= 24;
         long days = remainingUnits;
 
-        return (positive ? "+" : "-") + Long.toString(days) + " " + Long.toString(hours)
-            + ":" + Long.toString(minutes) + ":" + Long.toString(seconds) + "." +
-            Long.toString(milliseconds);
+        return (positive ? "+" : "-") + String.format("%d %02d:%02d:%02d.%03d",
+                days, hours, minutes, seconds, milliseconds
+        );
     }
 
     @Override
@@ -274,6 +274,8 @@ public class ValueDuration extends ValueSimple<Long> {
         switch(type.getPrimaryType()) {
             case STRING:
                 return getValue() == null? ValueString.NULL_STRING : new ValueString(makeString());
+            case INT:
+                return new ValueInt(getValue() == null? null : getValue());
             case DURATION:
                 return this;
             default: