Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Made reference manager thread safe.

Browse Source
This commit is contained in:
akwizgran
2013-04-13 14:06:26 +01:00
parent f1ebbc28f3
commit 32cf3e24e2
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/net/sf/briar/android/ReferenceManagerImpl.java
View File

@@ -8,18 +8,18 @@ import java.util.logging.Logger;
import net.sf.briar.api.android.ReferenceManager; import net.sf.briar.api.android.ReferenceManager;
// This class is not thread-safe.
class ReferenceManagerImpl implements ReferenceManager { class ReferenceManagerImpl implements ReferenceManager {
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(ReferenceManagerImpl.class.getName()); Logger.getLogger(ReferenceManagerImpl.class.getName());
// Locking: this
private final Map<Class<?>, Map<Long, Object>> outerMap = private final Map<Class<?>, Map<Long, Object>> outerMap =
new HashMap<Class<?>, Map<Long, Object>>(); new HashMap<Class<?>, Map<Long, Object>>();
private long nextHandle = 0; private long nextHandle = 0; // Locking: this
public <T> T getReference(long handle, Class<T> c) { public synchronized <T> T getReference(long handle, Class<T> c) {
Map<Long, Object> innerMap = outerMap.get(c); Map<Long, Object> innerMap = outerMap.get(c);
if(innerMap == null) { if(innerMap == null) {
if(LOG.isLoggable(INFO)) if(LOG.isLoggable(INFO))
@@ -32,7 +32,7 @@ class ReferenceManagerImpl implements ReferenceManager {
return c.cast(o); return c.cast(o);
} }
public <T> long putReference(T reference, Class<T> c) { public synchronized <T> long putReference(T reference, Class<T> c) {
Map<Long, Object> innerMap = outerMap.get(c); Map<Long, Object> innerMap = outerMap.get(c);
if(innerMap == null) { if(innerMap == null) {
innerMap = new HashMap<Long, Object>(); innerMap = new HashMap<Long, Object>();
@@ -47,7 +47,7 @@ class ReferenceManagerImpl implements ReferenceManager {
return handle; return handle;
} }
public <T> T removeReference(long handle, Class<T> c) { public synchronized <T> T removeReference(long handle, Class<T> c) {
Map<Long, Object> innerMap = outerMap.get(c); Map<Long, Object> innerMap = outerMap.get(c);
if(innerMap == null) return null; if(innerMap == null) return null;
Object o = innerMap.remove(handle); Object o = innerMap.remove(handle);

4
briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
View File

@@ -360,7 +360,6 @@ implements InvitationListener {
} }
public void connectionFailed() { public void connectionFailed() {
// FIXME: Do this on the UI thread
referenceManager.removeReference(handle, InvitationTask.class); referenceManager.removeReference(handle, InvitationTask.class);
} }
@@ -369,17 +368,14 @@ implements InvitationListener {
} }
public void remoteConfirmationFailed() { public void remoteConfirmationFailed() {
// FIXME: Do this on the UI thread
referenceManager.removeReference(handle, InvitationTask.class); referenceManager.removeReference(handle, InvitationTask.class);
} }
public void pseudonymExchangeSucceeded(String remoteName) { public void pseudonymExchangeSucceeded(String remoteName) {
// FIXME: Do this on the UI thread
referenceManager.removeReference(handle, InvitationTask.class); referenceManager.removeReference(handle, InvitationTask.class);
} }
public void pseudonymExchangeFailed() { public void pseudonymExchangeFailed() {
// FIXME: Do this on the UI thread
referenceManager.removeReference(handle, InvitationTask.class); referenceManager.removeReference(handle, InvitationTask.class);
} }
} }

3
briar-api/src/net/sf/briar/api/android/ReferenceManager.java
View File

@@ -4,9 +4,6 @@ package net.sf.briar.api.android;
* Manages mappings between object references and serialisable handles. This * Manages mappings between object references and serialisable handles. This
* enables references to be passed between Android UI objects that belong to * enables references to be passed between Android UI objects that belong to
* the same process but can only communicate via serialisation. * the same process but can only communicate via serialisation.
* <p>
* This interface is designed to be accessed from the UI thread, so
* implementations may not be thread-safe.
*/ */
public interface ReferenceManager { public interface ReferenceManager {