Merge pull request knowm#829 from jheusser/ok_ltc_cancel

OkCoin: Cancellation of LTC when no BTC orders open
emircem · Jan 21, 2015 · bf24d35 · bf24d35
2 parents 7eb974a + 2bb0c72
commit bf24d35
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...nge-okcoin/src/main/java/com/xeiam/xchange/okcoin/service/polling/OkCoinTradeService.java b/...nge-okcoin/src/main/java/com/xeiam/xchange/okcoin/service/polling/OkCoinTradeService.java
@@ -6,11 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.xeiam.xchange.dto.marketdata.TradeServiceHelper;
-import com.xeiam.xchange.service.polling.trade.TradeHistoryParamCurrencyPair;
-import com.xeiam.xchange.service.polling.trade.TradeHistoryParamPaging;
-import com.xeiam.xchange.service.polling.trade.DefaultTradeHistoryParamPaging;
-import com.xeiam.xchange.service.polling.trade.TradeHistoryParams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,15 +15,20 @@
 import com.xeiam.xchange.NotYetImplementedForExchangeException;
 import com.xeiam.xchange.currency.CurrencyPair;
 import com.xeiam.xchange.dto.Order.OrderType;
+import com.xeiam.xchange.dto.marketdata.TradeServiceHelper;
 import com.xeiam.xchange.dto.trade.LimitOrder;
 import com.xeiam.xchange.dto.trade.MarketOrder;
 import com.xeiam.xchange.dto.trade.OpenOrders;
 import com.xeiam.xchange.dto.trade.UserTrades;
 import com.xeiam.xchange.okcoin.OkCoinAdapters;
-import com.xeiam.xchange.okcoin.OkCoinException;
+import com.xeiam.xchange.okcoin.OkCoinUtils;
 import com.xeiam.xchange.okcoin.dto.trade.OkCoinOrderResult;
 import com.xeiam.xchange.okcoin.dto.trade.OkCoinTradeResult;
 import com.xeiam.xchange.service.polling.PollingTradeService;
+import com.xeiam.xchange.service.polling.trade.DefaultTradeHistoryParamPaging;
+import com.xeiam.xchange.service.polling.trade.TradeHistoryParamCurrencyPair;
+import com.xeiam.xchange.service.polling.trade.TradeHistoryParamPaging;
+import com.xeiam.xchange.service.polling.trade.TradeHistoryParams;
 
 public class OkCoinTradeService extends OkCoinTradeServiceRaw implements PollingTradeService {
  private static final OpenOrders noOpenOrders = new OpenOrders(Collections.<LimitOrder>emptyList());
@@ -109,8 +109,8 @@ public boolean cancelOrder(String orderId) throws ExchangeException, NotAvailabl
  ret = true;
  }
  break;
- } catch (OkCoinException e) {
- if (e.getErrorCode() == 10009) {
+ } catch (ExchangeException e) { 
+ if (e.getMessage().equals(OkCoinUtils.getErrorMessage(1009))) {
  // order not found.
  continue;
  }