[Amdatu-commits] SVN r738 - branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/extender

[subvers...@amdatu.org]

Author: bdekruijff at gmail.com
Date: Tue Feb  1 11:14:03 2011
New Revision: 738

Log:
AMDATU-245 prevent npe when no tenants can be resolved

Modified:
   
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/extender/TenanHostNameDispatchExtender.java

Modified: 
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/extender/TenanHostNameDispatchExtender.java
==============================================================================
--- 
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/extender/TenanHostNameDispatchExtender.java
        (original)
+++ 
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/extender/TenanHostNameDispatchExtender.java
        Tue Feb  1 11:14:03 2011
@@ -49,7 +49,7 @@
                 Map<String, String> matchProperties = new HashMap<String, 
String>();
                 matchProperties.put(TENANT_PROPERTY_PARAMETER, serverName);
                 List<TenantEntity> tenants = 
m_tenantManagementService.getTenants(matchProperties);
-                if (tenants != null) {
+                if (tenants != null && tenants.size() > 0) {
                     if (tenants.size() > 1) {
                         // FIXME proper logging
                         System.err.println("Hostname resolved to multiple 
tenants..... using first");