Merge remote-tracking branch 'origin/master'

This commit is contained in:
Lennart Hensler committed 2013-12-18 17:03:46 +01:00
commit 75e454c8b3
1 file changed
-4
@@ -426,10 +426,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
return tractracAdapterTracker.getService().getOrCreateTracTracAdapter(baseDomainFactory);
}
protected IgtimiConnectionFactory getIgtimiConnectionFactory(BundleContext context) {
return createAndOpenIgtimiTracker(context).getService();
}
protected ServiceTracker<TracTracAdapterFactory, TracTracAdapterFactory> createAndOpenTracTracAdapterTracker(BundleContext context) {
ServiceTracker<TracTracAdapterFactory, TracTracAdapterFactory> result = new ServiceTracker<TracTracAdapterFactory, TracTracAdapterFactory>(
context, TracTracAdapterFactory.class.getName(), null);