From b30da021d491ace47c1b6a7b5ad11e595a2399c9 Mon Sep 17 00:00:00 2001 From: Nils Schwabe Date: Wed, 9 Apr 2014 15:40:16 +0200 Subject: Added Globals.java and global properties Added Ftpserver test Created some ftp testign in App.java (needs to be removed) Added Ftplet to trigger on FTP Commands --- src/main/java/org/openslx/imagemaster/db/LDAPUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/org/openslx/imagemaster/db/LDAPUser.java') diff --git a/src/main/java/org/openslx/imagemaster/db/LDAPUser.java b/src/main/java/org/openslx/imagemaster/db/LDAPUser.java index ae8d38d..1034116 100644 --- a/src/main/java/org/openslx/imagemaster/db/LDAPUser.java +++ b/src/main/java/org/openslx/imagemaster/db/LDAPUser.java @@ -104,7 +104,7 @@ public class LDAPUser extends User { lastName = entry.get("sn").getString(); eMail = entry.get("rufPreferredMail").getString(); // get the satellite address from db - DbSatellite dbSatellite = DbSatellite.createDbSatellite(organization); + DbSatellite dbSatellite = DbSatellite.fromOrganization(organization); if (dbSatellite != null) { satelliteAddress = dbSatellite.getAddress(); } else { -- cgit v1.2.3-55-g7522