kirillius
/
mikrotik-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanups. Fixed timeout corner case in #16

This commit is contained in:
Gideon le Grange 2015-03-29 23:14:32 +02:00
parent 6a73b28b59
commit afeeec67db
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
View File

@ -82,7 +82,7 @@ public final class ApiConnectionImpl extends ApiConnection {
@Override @Override
public List<Map<String, String>> execute(String cmd) throws MikrotikApiException { public List<Map<String, String>> execute(String cmd) throws MikrotikApiException {
return execute(Parser.parse(cmd), timeOut); return execute(Parser.parse(cmd), timeout);
} }
@Override @Override
@ -97,23 +97,23 @@ public final class ApiConnectionImpl extends ApiConnection {
@Override @Override
public int getTimeout() { public int getTimeout() {
return timeOut; return timeout;
} }
@Override @Override
public void setTimeout(int timeout) throws MikrotikApiException { public void setTimeout(int timeout) throws MikrotikApiException {
if (timeout >=0) { if (timeout > 0) {
timeOut = timeout; this.timeout = timeout;
} }
else { else {
throw new MikrotikApiException(String.format("Invalid timeout value '%d'; must be postive or 0", timeout)); throw new MikrotikApiException(String.format("Invalid timeout value '%d'; must be postive", timeout));
} }
} }
private List<Map<String, String>> execute(Command cmd, int timeOut) throws MikrotikApiException { private List<Map<String, String>> execute(Command cmd, int timeout) throws MikrotikApiException {
SyncListener l = new SyncListener(); SyncListener l = new SyncListener();
execute(cmd, l); execute(cmd, l);
return l.getResults(timeOut); return l.getResults(timeout);
} }
private String execute(Command cmd, ResultListener lis) throws MikrotikApiException { private String execute(Command cmd, ResultListener lis) throws MikrotikApiException {
@ -201,7 +201,7 @@ public final class ApiConnectionImpl extends ApiConnection {
private Processor processor; private Processor processor;
private final Map<String, ResultListener> listeners; private final Map<String, ResultListener> listeners;
private Integer _tag = 0; private Integer _tag = 0;
private int timeOut = ApiConnection.DEFAULT_COMMAND_TIMEOUT; private int timeout = ApiConnection.DEFAULT_COMMAND_TIMEOUT;
/** /**
* thread to read data from the socket and process it into Strings * thread to read data from the socket and process it into Strings
@ -478,16 +478,16 @@ public final class ApiConnectionImpl extends ApiConnection {
results.add(result); results.add(result);
} }
private List<Map<String, String>> getResults(int timeOut) throws MikrotikApiException { private List<Map<String, String>> getResults(int timeout) throws MikrotikApiException {
try { try {
synchronized (this) { // don't wait if we already have a result. synchronized (this) { // don't wait if we already have a result.
int waitTime = timeOut; int waitTime = timeout;
while (!complete && (waitTime > 0)) { while (!complete && (waitTime > 0)) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
wait(waitTime); wait(waitTime);
waitTime = waitTime - (int)(System.currentTimeMillis() - start); waitTime = waitTime - (int)(System.currentTimeMillis() - start);
if ((waitTime < 0) && !complete) { if ((waitTime <= 0) && !complete) {
err = new ApiConnectionException(String.format("Command timed out after %d ms", timeOut)); err = new ApiConnectionException(String.format("Command timed out after %d ms", timeout));
} }
} }
} }