source: josm/trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java@ 12596

Last change on this file since 12596 was 11809, checked in by Don-vip, 7 years ago

findbugs - BC_UNCONFIRMED_CAST
  • Property svn:eol-style set to native
File size: 24.8 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.io;
3
4import static org.openstreetmap.josm.tools.I18n.tr;
5import static org.openstreetmap.josm.tools.I18n.trn;
6
7import java.io.IOException;
8import java.io.InputStream;
9import java.net.HttpURLConnection;
10import java.util.ArrayList;
11import java.util.Collection;
12import java.util.Collections;
13import java.util.HashSet;
14import java.util.Iterator;
15import java.util.LinkedHashSet;
16import java.util.List;
17import java.util.Set;
18import java.util.concurrent.Callable;
19import java.util.concurrent.CompletionService;
20import java.util.concurrent.ExecutionException;
21import java.util.concurrent.ExecutorCompletionService;
22import java.util.concurrent.ExecutorService;
23import java.util.concurrent.Executors;
24import java.util.concurrent.Future;
25
26import org.openstreetmap.josm.Main;
27import org.openstreetmap.josm.data.osm.DataSet;
28import org.openstreetmap.josm.data.osm.DataSetMerger;
29import org.openstreetmap.josm.data.osm.Node;
30import org.openstreetmap.josm.data.osm.OsmPrimitive;
31import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
32import org.openstreetmap.josm.data.osm.PrimitiveId;
33import org.openstreetmap.josm.data.osm.Relation;
34import org.openstreetmap.josm.data.osm.RelationMember;
35import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
36import org.openstreetmap.josm.data.osm.Way;
37import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
38import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
39import org.openstreetmap.josm.gui.progress.ProgressMonitor;
40import org.openstreetmap.josm.tools.Utils;
41
42/**
43 * Retrieves a set of {@link OsmPrimitive}s from an OSM server using the so called
44 * Multi Fetch API.
45 *
46 * Usage:
47 * <pre>
48 * MultiFetchServerObjectReader reader = MultiFetchServerObjectReader()
49 * .append(2345,2334,4444)
50 * .append(new Node(72343));
51 * reader.parseOsm();
52 * if (!reader.getMissingPrimitives().isEmpty()) {
53 * Main.info("There are missing primitives: " + reader.getMissingPrimitives());
54 * }
55 * if (!reader.getSkippedWays().isEmpty()) {
56 * Main.info("There are skipped ways: " + reader.getMissingPrimitives());
57 * }
58 * </pre>
59 */
60public class MultiFetchServerObjectReader extends OsmServerReader {
61 /**
62 * the max. number of primitives retrieved in one step. Assuming IDs with 7 digits,
63 * this leads to a max. request URL of ~ 1600 Bytes ((7 digits + 1 Separator) * 200),
64 * which should be safe according to the
65 * <a href="http://www.boutell.com/newfaq/misc/urllength.html">WWW FAQ</a>.
66 */
67 private static final int MAX_IDS_PER_REQUEST = 200;
68
69 private final Set<Long> nodes;
70 private final Set<Long> ways;
71 private final Set<Long> relations;
72 private Set<PrimitiveId> missingPrimitives;
73 private final DataSet outputDataSet;
74
75 /**
76 * Constructs a {@code MultiFetchServerObjectReader}.
77 */
78 protected MultiFetchServerObjectReader() {
79 nodes = new LinkedHashSet<>();
80 ways = new LinkedHashSet<>();
81 relations = new LinkedHashSet<>();
82 this.outputDataSet = new DataSet();
83 this.missingPrimitives = new LinkedHashSet<>();
84 }
85
86 /**
87 * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader}
88 * depending on the {@link OverpassServerPreference#useForMultiFetch preference}.
89 *
90 * @return a new instance
91 * @since 9241
92 */
93 public static MultiFetchServerObjectReader create() {
94 return create(OverpassServerPreference.useForMultiFetch());
95 }
96
97 /**
98 * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader}
99 * depending on the {@code fromMirror} parameter.
100 *
101 * @param fromMirror {@code false} for {@link MultiFetchServerObjectReader}, {@code true} for {@link MultiFetchOverpassObjectReader}
102 * @return a new instance
103 * @since 9241
104 */
105 static MultiFetchServerObjectReader create(final boolean fromMirror) {
106 if (fromMirror) {
107 return new MultiFetchOverpassObjectReader();
108 } else {
109 return new MultiFetchServerObjectReader();
110 }
111 }
112
113 /**
114 * Remembers an {@link OsmPrimitive}'s id. The id will
115 * later be fetched as part of a Multi Get request.
116 *
117 * Ignore the id if it represents a new primitives.
118 *
119 * @param id the id
120 */
121 protected void remember(PrimitiveId id) {
122 if (id.isNew()) return;
123 switch(id.getType()) {
124 case NODE: nodes.add(id.getUniqueId()); break;
125 case WAY: ways.add(id.getUniqueId()); break;
126 case RELATION: relations.add(id.getUniqueId()); break;
127 default: throw new AssertionError();
128 }
129 }
130
131 /**
132 * appends a {@link OsmPrimitive} id to the list of ids which will be fetched from the server.
133 *
134 * @param ds the {@link DataSet} to which the primitive belongs
135 * @param id the primitive id
136 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
137 * {@link OsmPrimitiveType#RELATION RELATION}
138 * @return this
139 */
140 public MultiFetchServerObjectReader append(DataSet ds, long id, OsmPrimitiveType type) {
141 OsmPrimitive p = ds.getPrimitiveById(id, type);
142 switch(type) {
143 case NODE:
144 return appendNode((Node) p);
145 case WAY:
146 return appendWay((Way) p);
147 case RELATION:
148 return appendRelation((Relation) p);
149 default:
150 return this;
151 }
152 }
153
154 /**
155 * appends a {@link Node} id to the list of ids which will be fetched from the server.
156 *
157 * @param node the node (ignored, if null)
158 * @return this
159 */
160 public MultiFetchServerObjectReader appendNode(Node node) {
161 if (node == null) return this;
162 remember(node.getPrimitiveId());
163 return this;
164 }
165
166 /**
167 * appends a {@link Way} id and the list of ids of nodes the way refers to the list of ids which will be fetched from the server.
168 *
169 * @param way the way (ignored, if null)
170 * @return this
171 */
172 public MultiFetchServerObjectReader appendWay(Way way) {
173 if (way == null) return this;
174 if (way.isNew()) return this;
175 for (Node node: !recursesDown() ? way.getNodes() : Collections.<Node>emptyList()) {
176 if (!node.isNew()) {
177 remember(node.getPrimitiveId());
178 }
179 }
180 remember(way.getPrimitiveId());
181 return this;
182 }
183
184 /**
185 * appends a {@link Relation} id to the list of ids which will be fetched from the server.
186 *
187 * @param relation the relation (ignored, if null)
188 * @return this
189 */
190 protected MultiFetchServerObjectReader appendRelation(Relation relation) {
191 if (relation == null) return this;
192 if (relation.isNew()) return this;
193 remember(relation.getPrimitiveId());
194 for (RelationMember member : !recursesDown() ? relation.getMembers() : Collections.<RelationMember>emptyList()) {
195 // avoid infinite recursion in case of cyclic dependencies in relations
196 if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)
197 && relations.contains(member.getMember().getId())) {
198 continue;
199 }
200 if (!member.getMember().isIncomplete()) {
201 append(member.getMember());
202 }
203 }
204 return this;
205 }
206
207 /**
208 * appends an {@link OsmPrimitive} to the list of ids which will be fetched from the server.
209 * @param primitive the primitive
210 * @return this
211 */
212 public MultiFetchServerObjectReader append(OsmPrimitive primitive) {
213 if (primitive instanceof Node) {
214 return appendNode((Node) primitive);
215 } else if (primitive instanceof Way) {
216 return appendWay((Way) primitive);
217 } else if (primitive instanceof Relation) {
218 return appendRelation((Relation) primitive);
219 }
220 return this;
221 }
222
223 /**
224 * appends a list of {@link OsmPrimitive} to the list of ids which will be fetched from the server.
225 *
226 * @param primitives the list of primitives (ignored, if null)
227 * @return this
228 *
229 * @see #append(OsmPrimitive)
230 */
231 public MultiFetchServerObjectReader append(Collection<? extends OsmPrimitive> primitives) {
232 if (primitives == null) return this;
233 for (OsmPrimitive primitive : primitives) {
234 append(primitive);
235 }
236 return this;
237 }
238
239 /**
240 * extracts a subset of max {@link #MAX_IDS_PER_REQUEST} ids from <code>ids</code> and
241 * replies the subset. The extracted subset is removed from <code>ids</code>.
242 *
243 * @param ids a set of ids
244 * @return the subset of ids
245 */
246 protected Set<Long> extractIdPackage(Set<Long> ids) {
247 Set<Long> pkg = new HashSet<>();
248 if (ids.isEmpty())
249 return pkg;
250 if (ids.size() > MAX_IDS_PER_REQUEST) {
251 Iterator<Long> it = ids.iterator();
252 for (int i = 0; i < MAX_IDS_PER_REQUEST; i++) {
253 pkg.add(it.next());
254 }
255 ids.removeAll(pkg);
256 } else {
257 pkg.addAll(ids);
258 ids.clear();
259 }
260 return pkg;
261 }
262
263 /**
264 * builds the Multi Get request string for a set of ids and a given {@link OsmPrimitiveType}.
265 *
266 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
267 * {@link OsmPrimitiveType#RELATION RELATION}
268 * @param idPackage the package of ids
269 * @return the request string
270 */
271 protected String buildRequestString(final OsmPrimitiveType type, Set<Long> idPackage) {
272 return type.getAPIName() + "s?" + type.getAPIName() + "s=" + Utils.join(",", idPackage);
273 }
274
275 protected void rememberNodesOfIncompleteWaysToLoad(DataSet from) {
276 for (Way w: from.getWays()) {
277 if (w.hasIncompleteNodes()) {
278 for (Node n: w.getNodes()) {
279 if (n.isIncomplete()) {
280 nodes.add(n.getId());
281 }
282 }
283 }
284 }
285 }
286
287 /**
288 * merges the dataset <code>from</code> to {@link #outputDataSet}.
289 *
290 * @param from the other dataset
291 */
292 protected void merge(DataSet from) {
293 final DataSetMerger visitor = new DataSetMerger(outputDataSet, from);
294 visitor.merge();
295 }
296
297 /**
298 * fetches a set of ids of a given {@link OsmPrimitiveType} from the server
299 *
300 * @param ids the set of ids
301 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
302 * {@link OsmPrimitiveType#RELATION RELATION}
303 * @param progressMonitor progress monitor
304 * @throws OsmTransferException if an error occurs while communicating with the API server
305 */
306 protected void fetchPrimitives(Set<Long> ids, OsmPrimitiveType type, ProgressMonitor progressMonitor) throws OsmTransferException {
307 String msg;
308 final String baseUrl = getBaseUrl();
309 switch (type) {
310 // CHECKSTYLE.OFF: SingleSpaceSeparator
311 case NODE: msg = tr("Fetching a package of nodes from ''{0}''", baseUrl); break;
312 case WAY: msg = tr("Fetching a package of ways from ''{0}''", baseUrl); break;
313 case RELATION: msg = tr("Fetching a package of relations from ''{0}''", baseUrl); break;
314 // CHECKSTYLE.ON: SingleSpaceSeparator
315 default: throw new AssertionError();
316 }
317 progressMonitor.setTicksCount(ids.size());
318 progressMonitor.setTicks(0);
319 // The complete set containing all primitives to fetch
320 Set<Long> toFetch = new HashSet<>(ids);
321 // Build a list of fetchers that will download smaller sets containing only MAX_IDS_PER_REQUEST (200) primitives each.
322 // we will run up to MAX_DOWNLOAD_THREADS concurrent fetchers.
323 int threadsNumber = Main.pref.getInteger("osm.download.threads", OsmApi.MAX_DOWNLOAD_THREADS);
324 threadsNumber = Utils.clamp(threadsNumber, 1, OsmApi.MAX_DOWNLOAD_THREADS);
325 final ExecutorService exec = Executors.newFixedThreadPool(
326 threadsNumber, Utils.newThreadFactory(getClass() + "-%d", Thread.NORM_PRIORITY));
327 CompletionService<FetchResult> ecs = new ExecutorCompletionService<>(exec);
328 List<Future<FetchResult>> jobs = new ArrayList<>();
329 while (!toFetch.isEmpty()) {
330 jobs.add(ecs.submit(new Fetcher(type, extractIdPackage(toFetch), progressMonitor)));
331 }
332 // Run the fetchers
333 for (int i = 0; i < jobs.size() && !isCanceled(); i++) {
334 progressMonitor.subTask(msg + "... " + progressMonitor.getTicks() + '/' + progressMonitor.getTicksCount());
335 try {
336 FetchResult result = ecs.take().get();
337 if (result.missingPrimitives != null) {
338 missingPrimitives.addAll(result.missingPrimitives);
339 }
340 if (result.dataSet != null && !isCanceled()) {
341 rememberNodesOfIncompleteWaysToLoad(result.dataSet);
342 merge(result.dataSet);
343 }
344 } catch (InterruptedException | ExecutionException e) {
345 Main.error(e);
346 }
347 }
348 exec.shutdown();
349 // Cancel requests if the user chose to
350 if (isCanceled()) {
351 for (Future<FetchResult> job : jobs) {
352 job.cancel(true);
353 }
354 }
355 }
356
357 /**
358 * invokes one or more Multi Gets to fetch the {@link OsmPrimitive}s and replies
359 * the dataset of retrieved primitives. Note that the dataset includes non visible primitives too!
360 * In contrast to a simple Get for a node, a way, or a relation, a Multi Get always replies
361 * the latest version of the primitive (if any), even if the primitive is not visible (i.e. if
362 * visible==false).
363 *
364 * Invoke {@link #getMissingPrimitives()} to get a list of primitives which have not been
365 * found on the server (the server response code was 404)
366 *
367 * @return the parsed data
368 * @throws OsmTransferException if an error occurs while communicating with the API server
369 * @see #getMissingPrimitives()
370 *
371 */
372 @Override
373 public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
374 int n = nodes.size() + ways.size() + relations.size();
375 progressMonitor.beginTask(trn("Downloading {0} object from ''{1}''",
376 "Downloading {0} objects from ''{1}''", n, n, OsmApi.getOsmApi().getBaseUrl()));
377 try {
378 missingPrimitives = new HashSet<>();
379 if (isCanceled()) return null;
380 fetchPrimitives(ways, OsmPrimitiveType.WAY, progressMonitor);
381 if (isCanceled()) return null;
382 fetchPrimitives(nodes, OsmPrimitiveType.NODE, progressMonitor);
383 if (isCanceled()) return null;
384 fetchPrimitives(relations, OsmPrimitiveType.RELATION, progressMonitor);
385 if (outputDataSet != null) {
386 outputDataSet.deleteInvisible();
387 }
388 return outputDataSet;
389 } finally {
390 progressMonitor.finishTask();
391 }
392 }
393
394 /**
395 * replies the set of ids of all primitives for which a fetch request to the
396 * server was submitted but which are not available from the server (the server
397 * replied a return code of 404)
398 *
399 * @return the set of ids of missing primitives
400 */
401 public Set<PrimitiveId> getMissingPrimitives() {
402 return missingPrimitives;
403 }
404
405 /**
406 * Whether this reader fetches nodes when loading ways, or members when loading relations.
407 *
408 * @return {@code true} if the reader recurses down
409 */
410 protected boolean recursesDown() {
411 return false;
412 }
413
414 /**
415 * The class holding the results given by {@link Fetcher}.
416 * It is only a wrapper of the resulting {@link DataSet} and the collection of {@link PrimitiveId} that could not have been loaded.
417 */
418 protected static class FetchResult {
419
420 /**
421 * The resulting data set
422 */
423 public final DataSet dataSet;
424
425 /**
426 * The collection of primitive ids that could not have been loaded
427 */
428 public final Set<PrimitiveId> missingPrimitives;
429
430 /**
431 * Constructs a {@code FetchResult}
432 * @param dataSet The resulting data set
433 * @param missingPrimitives The collection of primitive ids that could not have been loaded
434 */
435 public FetchResult(DataSet dataSet, Set<PrimitiveId> missingPrimitives) {
436 this.dataSet = dataSet;
437 this.missingPrimitives = missingPrimitives;
438 }
439 }
440
441 /**
442 * The class that actually download data from OSM API.
443 * Several instances of this class are used by {@link MultiFetchServerObjectReader} (one per set of primitives to fetch).
444 * The inheritance of {@link OsmServerReader} is only explained by the need to have a distinct OSM connection by {@code Fetcher} instance.
445 * @see FetchResult
446 */
447 protected class Fetcher extends OsmServerReader implements Callable<FetchResult> {
448
449 private final Set<Long> pkg;
450 private final OsmPrimitiveType type;
451 private final ProgressMonitor progressMonitor;
452
453 /**
454 * Constructs a {@code Fetcher}
455 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
456 * {@link OsmPrimitiveType#RELATION RELATION}
457 * @param idsPackage The set of primitives ids to fetch
458 * @param progressMonitor The progress monitor
459 */
460 public Fetcher(OsmPrimitiveType type, Set<Long> idsPackage, ProgressMonitor progressMonitor) {
461 this.pkg = idsPackage;
462 this.type = type;
463 this.progressMonitor = progressMonitor;
464 }
465
466 @Override
467 public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
468 // This method is implemented because of the OsmServerReader inheritance, but not used,
469 // as the main target of this class is the call() method.
470 return fetch(progressMonitor).dataSet;
471 }
472
473 @Override
474 public FetchResult call() throws Exception {
475 return fetch(progressMonitor);
476 }
477
478 /**
479 * fetches the requested primitives and updates the specified progress monitor.
480 * @param progressMonitor the progress monitor
481 * @return the {@link FetchResult} of this operation
482 * @throws OsmTransferException if an error occurs while communicating with the API server
483 */
484 protected FetchResult fetch(ProgressMonitor progressMonitor) throws OsmTransferException {
485 try {
486 return multiGetIdPackage(type, pkg, progressMonitor);
487 } catch (OsmApiException e) {
488 if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
489 Main.info(tr("Server replied with response code 404, retrying with an individual request for each object."));
490 return singleGetIdPackage(type, pkg, progressMonitor);
491 } else {
492 throw e;
493 }
494 }
495 }
496
497 @Override
498 protected String getBaseUrl() {
499 return MultiFetchServerObjectReader.this.getBaseUrl();
500 }
501
502 /**
503 * invokes a Multi Get for a set of ids and a given {@link OsmPrimitiveType}.
504 * The retrieved primitives are merged to {@link #outputDataSet}.
505 *
506 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
507 * {@link OsmPrimitiveType#RELATION RELATION}
508 * @param pkg the package of ids
509 * @param progressMonitor progress monitor
510 * @return the {@link FetchResult} of this operation
511 * @throws OsmTransferException if an error occurs while communicating with the API server
512 */
513 protected FetchResult multiGetIdPackage(OsmPrimitiveType type, Set<Long> pkg, ProgressMonitor progressMonitor)
514 throws OsmTransferException {
515 String request = buildRequestString(type, pkg);
516 FetchResult result = null;
517 try (InputStream in = getInputStream(request, NullProgressMonitor.INSTANCE)) {
518 if (in == null) return null;
519 progressMonitor.subTask(tr("Downloading OSM data..."));
520 try {
521 result = new FetchResult(OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(pkg.size(), false)), null);
522 } catch (IllegalDataException e) {
523 throw new OsmTransferException(e);
524 }
525 } catch (IOException ex) {
526 Main.warn(ex);
527 }
528 return result;
529 }
530
531 /**
532 * invokes a Multi Get for a single id and a given {@link OsmPrimitiveType}.
533 * The retrieved primitive is merged to {@link #outputDataSet}.
534 *
535 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
536 * {@link OsmPrimitiveType#RELATION RELATION}
537 * @param id the id
538 * @param progressMonitor progress monitor
539 * @return the {@link DataSet} resulting of this operation
540 * @throws OsmTransferException if an error occurs while communicating with the API server
541 */
542 protected DataSet singleGetId(OsmPrimitiveType type, long id, ProgressMonitor progressMonitor) throws OsmTransferException {
543 String request = buildRequestString(type, Collections.singleton(id));
544 DataSet result = null;
545 try (InputStream in = getInputStream(request, NullProgressMonitor.INSTANCE)) {
546 if (in == null) return null;
547 progressMonitor.subTask(tr("Downloading OSM data..."));
548 try {
549 result = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
550 } catch (IllegalDataException e) {
551 throw new OsmTransferException(e);
552 }
553 } catch (IOException ex) {
554 Main.warn(ex);
555 }
556 return result;
557 }
558
559 /**
560 * invokes a sequence of Multi Gets for individual ids in a set of ids and a given {@link OsmPrimitiveType}.
561 * The retrieved primitives are merged to {@link #outputDataSet}.
562 *
563 * This method is used if one of the ids in pkg doesn't exist (the server replies with return code 404).
564 * If the set is fetched with this method it is possible to find out which of the ids doesn't exist.
565 * Unfortunately, the server does not provide an error header or an error body for a 404 reply.
566 *
567 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
568 * {@link OsmPrimitiveType#RELATION RELATION}
569 * @param pkg the set of ids
570 * @param progressMonitor progress monitor
571 * @return the {@link FetchResult} of this operation
572 * @throws OsmTransferException if an error occurs while communicating with the API server
573 */
574 protected FetchResult singleGetIdPackage(OsmPrimitiveType type, Set<Long> pkg, ProgressMonitor progressMonitor)
575 throws OsmTransferException {
576 FetchResult result = new FetchResult(new DataSet(), new HashSet<PrimitiveId>());
577 String baseUrl = OsmApi.getOsmApi().getBaseUrl();
578 for (long id : pkg) {
579 try {
580 String msg;
581 switch (type) {
582 // CHECKSTYLE.OFF: SingleSpaceSeparator
583 case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, baseUrl); break;
584 case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, baseUrl); break;
585 case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, baseUrl); break;
586 // CHECKSTYLE.ON: SingleSpaceSeparator
587 default: throw new AssertionError();
588 }
589 progressMonitor.setCustomText(msg);
590 result.dataSet.mergeFrom(singleGetId(type, id, progressMonitor));
591 } catch (OsmApiException e) {
592 if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
593 Main.info(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id)));
594 result.missingPrimitives.add(new SimplePrimitiveId(id, type));
595 } else {
596 throw e;
597 }
598 }
599 }
600 return result;
601 }
602 }
603}
Note: See TracBrowser for help on using the repository browser.