Merge remote-tracking branch 'svn/scipioce-1.14' into scipioce-1.14

Author: pplx

framework/webapp/src/org/ofbiz/webapp/control/#Worker.java

@@ -461,12 +461,14 @@ public static String login(HttpServletRequest request, HttpServletResponse respo
                     request.setAttribute("_ERROR_MESSAGE_", errMsg);
                     return "error";
                 }
+                
+                // SCIPIO: stop if delegator null, for now
                 if(delegator == null){
                     Map<String, String> messageMap = UtilMisc.toMap("errorMessage", "Tenant [" + tenantId + "]  not found...");
                     String errMsg = UtilProperties.getMessage(resourceWebapp, "loginevents.following_error_occurred_during_login", messageMap, UtilHttp.getLocale(request));
                     request.setAttribute("_ERROR_MESSAGE_", errMsg);
                     return "error";
-               }
+                }
 
                 // NOTE: these will be local for now and set in the request and session later, after we've verified that the user
                 setupNewDelegatorEtc = true;