[anx] Fix date handling in user trade history param

emircem · Nov 24, 2014 · f870475 · f870475
1 parent 0e86252
commit f870475
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/xchange-anx/src/main/java/com/xeiam/xchange/anx/v2/service/polling/ANXTradeService.java b/xchange-anx/src/main/java/com/xeiam/xchange/anx/v2/service/polling/ANXTradeService.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 
+import com.xeiam.xchange.utils.DateUtils;
 import si.mazi.rescu.SynchronizedValueFactory;
 
 import com.xeiam.xchange.ExchangeException;
@@ -113,8 +114,14 @@ public UserTrades getTradeHistory(Long from, Long to) throws IOException {
  @Override
  public UserTrades getTradeHistory(TradeHistoryParams params) throws ExchangeException, IOException {
 
- TradeHistoryParamsTimeSpan p = (TradeHistoryParamsTimeSpan) params;
- return getTradeHistory(p.getStartTime(), p.getEndTime());
+ Long from = null;
+ Long to = null;
+ if (params instanceof TradeHistoryParamsTimeSpan) {
+ TradeHistoryParamsTimeSpan p = (TradeHistoryParamsTimeSpan) params;
+ from = DateUtils.toUnixTimeNullSafe(p.getStartTime());
+ to = DateUtils.toUnixTimeNullSafe(p.getEndTime());
+ }
+ return getTradeHistory(from, to);
  }
 
  @Override

diff --git a/xchange-core/src/main/java/com/xeiam/xchange/utils/DateUtils.java b/xchange-core/src/main/java/com/xeiam/xchange/utils/DateUtils.java
@@ -117,4 +117,13 @@ public static long toUnixTime(Date time) {
  return time.getTime() / 1000;
  }
 
+ /**
+ * Convert java time to unix time long, simply by dividing by the time 1000. Null safe
+ * @return
+ */
+ public static Long toUnixTimeNullSafe(Date time) {
+
+ return time == null ? null : time.getTime() / 1000;
+ }
+
 }