gistfile1.txt

diff --git a/core/services/src/main/java/org/openengsb/core/services/internal/ConnectorManagerImpl.java b/core/services/src/main/java/org/openengsb/core/services/internal/ConnectorManagerImpl.java
index 4a70b6f..dfd737f 100644
--- a/core/services/src/main/java/org/openengsb/core/services/internal/ConnectorManagerImpl.java
+++ b/core/services/src/main/java/org/openengsb/core/services/internal/ConnectorManagerImpl.java
@@ -45,31 +45,24 @@ public class ConnectorManagerImpl implements ConnectorManager {
     private ConnectorRegistrationManager registrationManager;
 
     public void init() {
-        /*
-         * FIXME [OPENENGSB-1301] This is done in background because integration-tests would break otherwise. It makes
-         * no difference for the runtime-system. This can hack can be removed as soon as OPENENGSB-1301 is fixed.
-         */
-        new Thread() {
-            @Override
-            public void run() {
-                List<ConnectorConfiguration> configs;
-                try {
-                    Map<String, String> emptyMap = Collections.emptyMap();
-                    configs = getConfigPersistence().load(emptyMap);
-                } catch (InvalidConfigurationException e) {
-                    throw new IllegalStateException(e);
-                } catch (PersistenceException e) {
-                    throw new IllegalStateException(e);
-                }
-                for (ConnectorConfiguration c : configs) {
-                    try {
-                        registrationManager.updateRegistration(c.getConnectorId(), c.getContent());
-                    } catch (ConnectorValidationFailedException e) {
-                        throw new IllegalStateException(e);
-                    }
-                }
+
+        List<ConnectorConfiguration> configs;
+        try {
+            Map<String, String> emptyMap = Collections.emptyMap();
+            configs = getConfigPersistence().load(emptyMap);
+        } catch (InvalidConfigurationException e) {
+            throw new IllegalStateException(e);
+        } catch (PersistenceException e) {
+            throw new IllegalStateException(e);
+        }
+        for (ConnectorConfiguration c : configs) {
+            try {
+                registrationManager.updateRegistration(c.getConnectorId(), c.getContent());
+            } catch (ConnectorValidationFailedException e) {
+                throw new IllegalStateException(e);
             }
-        }.start();
+        }
+
     }
 
     @Override