Author: lektran
Date: Thu Mar 18 00:56:54 2010
New Revision: 924575
URL: http://svn.apache.org/viewvc?rev=924575&view=rev
Log:
OrderHeader isn't cached so there's no point in trying to do lookups via the
cache
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=924575&r1=924574&r2=924575&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
(original)
+++
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
Thu Mar 18 00:56:54 2010
@@ -1599,7 +1599,7 @@ Debug.logInfo("updateSiteRoles, serviceC
return ServiceUtil.returnFailure(msg);
}
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader",
UtilMisc.toMap("orderId", orderId));
+ orderHeader = delegator.findByPrimaryKey("OrderHeader",
UtilMisc.toMap("orderId", orderId));
if (orderHeader == null) {
String msg = "No OrderHeader found for orderId:" + orderId;
return ServiceUtil.returnError(msg);
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=924575&r1=924574&r2=924575&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
(original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Thu Mar 18 00:56:54 2010
@@ -2662,7 +2662,7 @@ public class OrderServices {
//Locale locale = (Locale) context.get("locale");
try {
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader",
UtilMisc.toMap("orderId", orderId));
+ orderHeader = delegator.findByPrimaryKey("OrderHeader",
UtilMisc.toMap("orderId", orderId));
if (orderHeader != null)
result.put("orderHeader", orderHeader);
} catch (GenericEntityException e) {
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy?rev=924575&r1=924574&r2=924575&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
Thu Mar 18 00:56:54 2010
@@ -94,7 +94,7 @@ context.returnItemTypeMap = typeMap;
if (orderId) {
returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]);
context.returnableItems = returnRes.returnableItems;
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", [orderId :
orderId]);
+ orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId :
orderId]);
context.orderHeader = orderHeader;
}
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=924575&r1=924574&r2=924575&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
Thu Mar 18 00:56:54 2010
@@ -88,7 +88,7 @@ orderHeader = null;
if (orderId) {
orderRoles = delegator.findByAnd("OrderRole", [orderId : orderId,
roleTypeId : "BILL_TO_CUSTOMER"]);
orderRole = EntityUtil.getFirst(orderRoles);
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", [orderId :
orderId]);
+ orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId :
orderId]);
}
context.orderRole = orderRole;
context.orderHeader = orderHeader;
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=924575&r1=924574&r2=924575&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
Thu Mar 18 00:56:54 2010
@@ -237,7 +237,7 @@ public class SubscriptionServices {
String msg = "No OrderRole found for orderId:" + orderId;
return ServiceUtil.returnFailure(msg);
}
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader",
UtilMisc.toMap("orderId", orderId));
+ orderHeader = delegator.findByPrimaryKey("OrderHeader",
UtilMisc.toMap("orderId", orderId));
if (orderHeader == null) {
String msg = "No OrderHeader found for orderId:" + orderId;
return ServiceUtil.returnError(msg);
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy?rev=924575&r1=924574&r2=924575&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy
Thu Mar 18 00:56:54 2010
@@ -36,7 +36,7 @@ context.returnReasons = returnReasons;
if (orderId) {
returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]);
context.returnableItems = returnRes.returnableItems;
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", [orderId :
orderId]);
+ orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId :
orderId]);
context.orderHeader = orderHeader;
}
