Commit cb021ac3 authored by Tom Evans's avatar Tom Evans Committed by tevans

Fix intermittent NPE caused by session cleanup after a member leaves cluster

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13979 b35dd754-fafc-0310-a699-88a17e54d16e
parent cb081342
...@@ -150,7 +150,8 @@ public class RemoteClientSession extends RemoteSession implements ClientSession ...@@ -150,7 +150,8 @@ public class RemoteClientSession extends RemoteSession implements ClientSession
public int incrementConflictCount() { public int incrementConflictCount() {
ClusterTask task = getRemoteSessionTask(RemoteSessionTask.Operation.incrementConflictCount); ClusterTask task = getRemoteSessionTask(RemoteSessionTask.Operation.incrementConflictCount);
return (Integer) doSynchronousClusterTask(task); Object result = doSynchronousClusterTask(task);
return result == null ? 0 : (Integer) result;
} }
RemoteSessionTask getRemoteSessionTask(RemoteSessionTask.Operation operation) { RemoteSessionTask getRemoteSessionTask(RemoteSessionTask.Operation operation) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment