AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Multimap is pretty rad

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6129 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2010-08-12 20:59:47 +00:00
parent 696f77beb5
commit c12e1e44b3
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/server/InvocationManager.java
+5 -11
View File
@@ -24,8 +24,9 @@ package com.threerings.presents.server;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Multimap;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -142,11 +143,7 @@ public class InvocationManager
// if it's a bootstrap service, slap it in the list // if it's a bootstrap service, slap it in the list
if (group != null) { if (group != null) {
List<InvocationMarshaller> list = _bootlists.get(group); _bootlists.put(group, marsh);
if (list == null) {
_bootlists.put(group, list = Lists.newArrayList());
}
list.add(marsh);
} }
_recentRegServices.put(Integer.valueOf(invCode), marsh.getClass().getName()); _recentRegServices.put(Integer.valueOf(invCode), marsh.getClass().getName());
@@ -181,10 +178,7 @@ public class InvocationManager
{ {
List<InvocationMarshaller> services = Lists.newArrayList(); List<InvocationMarshaller> services = Lists.newArrayList();
for (String group : bootGroups) { for (String group : bootGroups) {
List<InvocationMarshaller> list = _bootlists.get(group); services.addAll(_bootlists.get(group));
if (list != null) {
services.addAll(list);
}
} }
return services; return services;
} }
@@ -309,7 +303,7 @@ public class InvocationManager
protected IntMap<InvocationDispatcher<?>> _dispatchers = IntMaps.newHashIntMap(); protected IntMap<InvocationDispatcher<?>> _dispatchers = IntMaps.newHashIntMap();
/** Maps bootstrap group to lists of services to be provided to clients at boot time. */ /** Maps bootstrap group to lists of services to be provided to clients at boot time. */
protected Map<String, List<InvocationMarshaller>> _bootlists = Maps.newHashMap(); protected Multimap<String, InvocationMarshaller> _bootlists = ArrayListMultimap.create();
/** Tracks recently registered services so that we can complain informatively if a request /** Tracks recently registered services so that we can complain informatively if a request
* comes in on a service we don't know about. */ * comes in on a service we don't know about. */