Skip to content

Commit fba5251

Browse files
authored
Merge pull request #484 from jburel/issue_457
Register properties even if agent is not active
2 parents 6dc6e26 + d9d9938 commit fba5251

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

src/main/java/org/openmicroscopy/shoola/env/data/DataServicesFactory.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -738,28 +738,26 @@ public void connect(UserCredentials uc)
738738
String url = (String) registry.lookup(LookupNames.HELP_ON_LINE_SEARCH);
739739
while (kk.hasNext()) {
740740
agentInfo = (AgentInfo) kk.next();
741-
if (agentInfo.isActive()) {
742-
reg = agentInfo.getRegistry();
743-
reg.bind(LookupNames.CAN_CREATE, canCreate);
744-
reg.bind(LookupNames.CURRENT_USER_DETAILS, exp);
745-
reg.bind(LookupNames.USER_GROUP_DETAILS, available);
746-
reg.bind(LookupNames.USERS_DETAILS, exps);
747-
reg.bind(LookupNames.USER_ADMINISTRATOR, uc.isAdministrator());
748-
reg.bind(LookupNames.IMAGE_QUALITY_LEVEL,
741+
reg = agentInfo.getRegistry();
742+
reg.bind(LookupNames.CAN_CREATE, canCreate);
743+
reg.bind(LookupNames.CURRENT_USER_DETAILS, exp);
744+
reg.bind(LookupNames.USER_GROUP_DETAILS, available);
745+
reg.bind(LookupNames.USERS_DETAILS, exps);
746+
reg.bind(LookupNames.USER_ADMINISTRATOR, uc.isAdministrator());
747+
reg.bind(LookupNames.IMAGE_QUALITY_LEVEL,
749748
determineImageQuality(uc.getSpeedLevel()));
750-
reg.bind(LookupNames.BINARY_AVAILABLE, b);
751-
reg.bind(LookupNames.HELP_ON_LINE_SEARCH, url);
749+
reg.bind(LookupNames.BINARY_AVAILABLE, b);
750+
reg.bind(LookupNames.HELP_ON_LINE_SEARCH, url);
752751

753-
reg.bind(LookupNames.PRIV_FULL, registry.lookup(LookupNames.PRIV_FULL));
754-
reg.bind(LookupNames.PRIV_EDIT_USER, registry.lookup(LookupNames.PRIV_EDIT_USER));
755-
reg.bind(LookupNames.PRIV_EDIT_GROUP, registry.lookup(LookupNames.PRIV_EDIT_GROUP));
756-
reg.bind(LookupNames.PRIV_MOVE_GROUP, registry.lookup(LookupNames.PRIV_MOVE_GROUP));
757-
reg.bind(LookupNames.PRIV_GROUP_ADD, registry.lookup(LookupNames.PRIV_GROUP_ADD));
758-
reg.bind(LookupNames.PRIV_SUDO, registry.lookup(LookupNames.PRIV_SUDO));
759-
reg.bind(LookupNames.PRIV_UPLOAD_SCRIPT, registry.lookup(LookupNames.PRIV_UPLOAD_SCRIPT));
760-
reg.bind(LookupNames.OFFLINE_IMPORT_ENABLED, registry.lookup(LookupNames.OFFLINE_IMPORT_ENABLED));
761-
reg.bind(LookupNames.MDE_IMPORT_ENABLED, registry.lookup(LookupNames.MDE_IMPORT_ENABLED));
762-
}
752+
reg.bind(LookupNames.PRIV_FULL, registry.lookup(LookupNames.PRIV_FULL));
753+
reg.bind(LookupNames.PRIV_EDIT_USER, registry.lookup(LookupNames.PRIV_EDIT_USER));
754+
reg.bind(LookupNames.PRIV_EDIT_GROUP, registry.lookup(LookupNames.PRIV_EDIT_GROUP));
755+
reg.bind(LookupNames.PRIV_MOVE_GROUP, registry.lookup(LookupNames.PRIV_MOVE_GROUP));
756+
reg.bind(LookupNames.PRIV_GROUP_ADD, registry.lookup(LookupNames.PRIV_GROUP_ADD));
757+
reg.bind(LookupNames.PRIV_SUDO, registry.lookup(LookupNames.PRIV_SUDO));
758+
reg.bind(LookupNames.PRIV_UPLOAD_SCRIPT, registry.lookup(LookupNames.PRIV_UPLOAD_SCRIPT));
759+
reg.bind(LookupNames.OFFLINE_IMPORT_ENABLED, registry.lookup(LookupNames.OFFLINE_IMPORT_ENABLED));
760+
reg.bind(LookupNames.MDE_IMPORT_ENABLED, registry.lookup(LookupNames.MDE_IMPORT_ENABLED));
763761
}
764762
}
765763

0 commit comments

Comments
 (0)