svn commit: r1621574 - in /ofbiz/trunk/framework/service/src/org/ofbiz/service: DispatchContext.java ModelServiceReader.java

[ad...@apache.org]

Author: adrianc
Date: Sun Aug 31 09:58:09 2014
New Revision: 1621574

URL: http://svn.apache.org/r1621574
Log:
Remove reference to DispatchContext from ModelServiceReader. The DispatchContext reference was only being used to get a Delegator reference, so we will use that instead.

Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java?rev=1621574&r1=1621573&r2=1621574&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java Sun Aug 31 09:58:09 2014
@@ -236,7 +236,7 @@ public class DispatchContext implements 
     private Callable<Map<String, ModelService>> createServiceReaderCallable(final ResourceHandler handler) {
         return new Callable<Map<String, ModelService>>() {
             public Map<String, ModelService> call() throws Exception {
-                return ModelServiceReader.getModelServiceMap(handler, DispatchContext.this);
+                return ModelServiceReader.getModelServiceMap(handler, DispatchContext.this.getDelegator());
             }
         };
     }

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=1621574&r1=1621573&r2=1621574&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java Sun Aug 31 09:58:09 2014
@@ -65,28 +65,28 @@ public class ModelServiceReader implemen
     protected boolean isFromURL;
     protected URL readerURL = null;
     protected ResourceHandler handler = null;
-    protected DispatchContext dctx = null;
+    protected Delegator delegator = null;
 
-    public static Map<String, ModelService> getModelServiceMap(URL readerURL, DispatchContext dctx) {
+    public static Map<String, ModelService> getModelServiceMap(URL readerURL, Delegator delegator) {
         if (readerURL == null) {
             Debug.logError("Cannot add reader with a null reader URL", module);
             return null;
         }
 
-        ModelServiceReader reader = new ModelServiceReader(true, readerURL, null, dctx);
+        ModelServiceReader reader = new ModelServiceReader(true, readerURL, null, delegator);
         return reader.getModelServices();
     }
 
-    public static Map<String, ModelService> getModelServiceMap(ResourceHandler handler, DispatchContext dctx) {
-        ModelServiceReader reader = new ModelServiceReader(false, null, handler, dctx);
+    public static Map<String, ModelService> getModelServiceMap(ResourceHandler handler, Delegator delegator) {
+        ModelServiceReader reader = new ModelServiceReader(false, null, handler, delegator);
         return reader.getModelServices();
     }
 
-    private ModelServiceReader(boolean isFromURL, URL readerURL, ResourceHandler handler, DispatchContext dctx) {
+    private ModelServiceReader(boolean isFromURL, URL readerURL, ResourceHandler handler, Delegator delegator) {
         this.isFromURL = isFromURL;
         this.readerURL = readerURL;
         this.handler = handler;
-        this.dctx = dctx;
+        this.delegator = delegator;
     }
 
     private Map<String, ModelService> getModelServices() {
@@ -437,8 +437,6 @@ public class ModelServiceReader implemen
         boolean includePk = "pk".equals(includeType) || "all".equals(includeType);
         boolean includeNonPk = "nonpk".equals(includeType) || "all".equals(includeType);
 
-        // need a delegator for this
-        Delegator delegator = dctx.getDelegator();
         if (delegator == null) {
             Debug.logWarning("Cannot use auto-attribute fields with a null delegator", module);
         }