From 0033e8abd268c9daa8f940836e8d3fc45540817e Mon Sep 17 00:00:00 2001
From: Elaine Tan <etan@trekglobal.com>
Date: Thu, 21 Mar 2013 14:12:03 +0800
Subject: [PATCH] Handle NPE in warehouses when login using System
 Administrator role

---
 .../WEB-INF/src/org/idempiere/webservices/AbstractService.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
index 18e9fdd1b0..7c09e946cd 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
@@ -154,6 +154,8 @@ public class AbstractService {
 				if (!okwh)
 					return "Error logging in - warehouse not allowed for this org";
 			}
+			else if (warehouses == null && loginRequest.getWarehouseID() > 0)
+				return "Error logging in - warehouse not allowed for this org";
 
 			String error = login.validateLogin(orglogin);
 			if (error != null && error.length() > 0)