From c6b6c202058796ac993f37bd88fc8f1e9f2af25b Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 8 Dec 2011 16:37:09 +0000
Subject: [PATCH] Bind instances rather than singletons.
---
components/net/sf/briar/db/DatabaseModule.java | 4 ++--
components/net/sf/briar/protocol/ProtocolModule.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/net/sf/briar/db/DatabaseModule.java b/components/net/sf/briar/db/DatabaseModule.java
index 36a63cd630..19abe69a7c 100644
--- a/components/net/sf/briar/db/DatabaseModule.java
+++ b/components/net/sf/briar/db/DatabaseModule.java
@@ -25,8 +25,8 @@ public class DatabaseModule extends AbstractModule {
@Override
protected void configure() {
bind(DatabaseCleaner.class).to(DatabaseCleanerImpl.class);
- bind(Executor.class).annotatedWith(DatabaseExecutor.class).to(
- DatabaseExecutorImpl.class).in(Singleton.class);
+ bind(Executor.class).annotatedWith(DatabaseExecutor.class).toInstance(
+ new DatabaseExecutorImpl());
}
@Provides
diff --git a/components/net/sf/briar/protocol/ProtocolModule.java b/components/net/sf/briar/protocol/ProtocolModule.java
index b85e75d535..921d30cd47 100644
--- a/components/net/sf/briar/protocol/ProtocolModule.java
+++ b/components/net/sf/briar/protocol/ProtocolModule.java
@@ -22,7 +22,6 @@ import net.sf.briar.api.serial.ObjectReader;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
-import com.google.inject.Singleton;
public class ProtocolModule extends AbstractModule {
@@ -35,8 +34,9 @@ public class ProtocolModule extends AbstractModule {
bind(ProtocolReaderFactory.class).to(ProtocolReaderFactoryImpl.class);
bind(ProtocolWriterFactory.class).to(ProtocolWriterFactoryImpl.class);
bind(UnverifiedBatchFactory.class).to(UnverifiedBatchFactoryImpl.class);
- bind(Executor.class).annotatedWith(VerificationExecutor.class).to(
- VerificationExecutorImpl.class).in(Singleton.class);
+ bind(Executor.class).annotatedWith(
+ VerificationExecutor.class).toInstance(
+ new VerificationExecutorImpl());
}
@Provides
--
GitLab