Trying to fix a NullPointerException by checking the refeence and enclosing the whole chunk of code into a syncronized block
This commit is contained in:
parent
d25a1f3fa0
commit
36420e7f56
1 changed files with 33 additions and 31 deletions
|
@ -35,8 +35,6 @@ public class NodeLatencyVerifier {
|
|||
|
||||
private HashMap<HttpUrl, FullNode> nodeURLMap = new HashMap<>();
|
||||
|
||||
// private WebSocket webSocket;
|
||||
|
||||
// Map used to store the first timestamp required for a RTT (Round Trip Time) measurement.
|
||||
// If:
|
||||
// RTT = t2 - t1
|
||||
|
@ -104,11 +102,10 @@ public class NodeLatencyVerifier {
|
|||
}
|
||||
|
||||
String normalURL = fullNode.getUrl().replace("wss://", "https://");
|
||||
if(!nodeURLMap.containsKey(fullNode.getUrl().replace("wss://", "https://"))){
|
||||
HttpUrl key = HttpUrl.parse(normalURL);
|
||||
if(!nodeURLMap.containsKey(key)){
|
||||
nodeURLMap.put(key, fullNode);
|
||||
}
|
||||
|
||||
client.newWebSocket(request, mWebSocketListener);
|
||||
}
|
||||
mHandler.postDelayed(this, verificationPeriod);
|
||||
|
@ -135,10 +132,11 @@ public class NodeLatencyVerifier {
|
|||
* Method used to handle the node's first response. The idea here is to obtain
|
||||
* the RTT (Round Trip Time) measurement and publish it using the PublishSubject.
|
||||
*
|
||||
* @param webSocket Websocket instance
|
||||
* @param webSocket WebSocket instance
|
||||
* @param response Response instance
|
||||
*/
|
||||
private void handleResponse(WebSocket webSocket, Response response){
|
||||
synchronized (this){
|
||||
// Obtaining the HttpUrl instance that was previously used as a key
|
||||
HttpUrl url = webSocket.request().url();
|
||||
if(nodeURLMap.containsKey(url)){
|
||||
|
@ -154,9 +152,12 @@ public class NodeLatencyVerifier {
|
|||
long before = timestamps.get(fullNode);
|
||||
delay = after - before;
|
||||
}
|
||||
|
||||
if(fullNode != null){
|
||||
fullNode.addLatencyValue(delay);
|
||||
subject.onNext(fullNode);
|
||||
}else{
|
||||
Log.w(TAG,"Could not extract FullNode instance from the map");
|
||||
}
|
||||
}else{
|
||||
// We cannot properly handle a response to a request whose
|
||||
// URL was not registered at the nodeURLMap. This is because without this,
|
||||
|
@ -168,6 +169,7 @@ public class NodeLatencyVerifier {
|
|||
}
|
||||
webSocket.close(NetworkService.NORMAL_CLOSURE_STATUS, null);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue