You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2007/10/19 16:20:45 UTC
svn commit: r586470 -
/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
Author: doogie
Date: Fri Oct 19 07:20:44 2007
New Revision: 586470
URL: http://svn.apache.org/viewvc?rev=586470&view=rev
Log:
No longer return anything from checkAuth; instead, just modify the
passed in context.
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=586470&r1=586469&r2=586470&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Fri Oct 19 07:20:44 2007
@@ -331,7 +331,7 @@
//Debug.logInfo("After [" + modelService.name + "] pre-auth ECA, before auth; isFailure=" + isFailure + ", isError=" + isError, module);
- context = checkAuth(localName, context, modelService);
+ checkAuth(localName, context, modelService);
Object userLogin = context.get("userLogin");
if (modelService.auth && userLogin == null) {
@@ -643,7 +643,7 @@
// pre-auth ECA
if (eventMap != null) ServiceEcaUtil.evalRules(service.name, eventMap, "auth", ctx, context, result, isError, isFailure);
- context = checkAuth(localName, context, service);
+ checkAuth(localName, context, service);
Object userLogin = context.get("userLogin");
if (service.auth && userLogin == null) {
@@ -818,7 +818,7 @@
}
// checks if parameters were passed for authentication
- private Map checkAuth(String localName, Map context, ModelService origService) throws ServiceAuthException, GenericServiceException {
+ private void checkAuth(String localName, Map context, ModelService origService) throws ServiceAuthException, GenericServiceException {
String service = ServiceConfigUtil.getElementAttr("authorization", "service-name");
if (service == null) {
@@ -826,7 +826,7 @@
}
if (service.equals(origService.name)) {
// manually calling the auth service, don't continue...
- return context;
+ return;
}
if (context.containsKey("login.username")) {
@@ -895,7 +895,7 @@
}
}
- return context;
+ return;
}
// gets a value object from name/password pair