From d8b9d2f62f38568afb9dcec98c93671bf0154170 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@hostsharing.net>
Date: Mon, 9 Jan 2012 17:50:13 +0000
Subject: [PATCH] fix #81 (untested)

---
 .../de/hsadmin/core/model/SecureDefaultModuleImpl.java   | 9 +++++----
 hsarback/src/de/hsadmin/mods/email/EMailAddress.java     | 3 ++-
 .../hsadmin/mods/email/EMailAddressProcessorFactory.java | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java b/hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java
index 30cf430..36ead48 100644
--- a/hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java
+++ b/hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java
@@ -44,11 +44,12 @@ public class SecureDefaultModuleImpl extends AbstractModuleImpl {
 		if (!transaction.getLoginUser().hasHostmasterRole()
 				&& (filterAnnot = getSecurityFilterAnnotation(entityClass)) != null) {
 			String securityCondition = filterAnnot.value();
-			if (condition != null && condition.length() > 0)
-				condition = "(" + condition + ")" + " AND ( "
-						+ securityCondition + ")";
-			else
+			if (condition != null && condition.length() > 0) {
+				condition = "(" + condition + ")" + " AND ( " + securityCondition + ")";
+			}
+			else {
 				condition = securityCondition;
+			}
 		}
 
 		// do query
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java b/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
index a62a54c..e7d5505 100644
--- a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
+++ b/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
@@ -158,7 +158,8 @@ public class EMailAddress extends AbstractEntity implements Serializable {
 	 */
 	@Transient
 	public String getFullDomain() {
-		return (getSubdomain() == null ? "" : (getSubdomain() + "."))
+		String sub = getSubdomain();
+		return (sub == null || sub.length() == 0 ? "" : (sub + "."))
 				+ getDomain().getName();
 	}
 
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java b/hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
index 7cfa4e2..608d115 100644
--- a/hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
@@ -49,12 +49,12 @@ public class EMailAddressProcessorFactory implements EntityProcessorFactory {
 		int emailAddressCount = emailAddressCount(em, email);
 		if (emailAddressCount == 0) {
 			// remove the domain from virtual.db
+			String fullDomain = email.getFullDomain();
 			cp.appendProcessor( 
-					new ShellProcessor( "postmap -d '" + email.getFullDomain() + "' /etc/postfix/virtual" ) );
+					new ShellProcessor( "postmap -d '" + fullDomain + "' /etc/postfix/virtual" ) );
 			WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
-			String domName = email.getDomain().getName();
 			for (String queueName : new String[] { "mail1", "mail2", "mail3" }) {
-				waitingTasksProcessor.appendProcessor(queueName, createMailinDeleteProcessor(domName), queueName + ".hostsharing.net");
+				waitingTasksProcessor.appendProcessor(queueName, createMailinDeleteProcessor(fullDomain), queueName + ".hostsharing.net");
 			}
 			return waitingTasksProcessor;
 		} else {