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 2012/05/12 23:20:15 UTC
svn commit: r1337671 [1/2] - in /ofbiz/trunk/applications/product:
src/org/ofbiz/product/catalog/ src/org/ofbiz/product/category/
src/org/ofbiz/product/config/ src/org/ofbiz/product/feature/
src/org/ofbiz/product/imagemanagement/ src/org/ofbiz/product/...
Author: doogie
Date: Sat May 12 21:20:13 2012
New Revision: 1337671
URL: http://svn.apache.org/viewvc?rev=1337671&view=rev
Log:
DEPRECATION: applications/product: findByPrimaryKey variants replaced
with findOne
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy
ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java Sat May 12 21:20:13 2012
@@ -204,7 +204,7 @@ public class CatalogWorker {
Delegator delegator = (Delegator) request.getAttribute("delegator");
try {
- GenericValue prodCatalog = delegator.findByPrimaryKeyCache("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId));
+ GenericValue prodCatalog = delegator.findOne("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId), true);
if (prodCatalog != null) {
return prodCatalog.getString("catalogName");
@@ -243,7 +243,7 @@ public class CatalogWorker {
Delegator delegator = (Delegator) request.getAttribute("delegator");
try {
- return delegator.findByPrimaryKeyCache("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId));
+ return delegator.findOne("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Error looking up name for prodCatalog with id " + prodCatalogId, module);
return null;
@@ -338,7 +338,7 @@ public class CatalogWorker {
Delegator delegator = (Delegator) request.getAttribute("delegator");
try {
- GenericValue prodCatalog = delegator.findByPrimaryKeyCache("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId));
+ GenericValue prodCatalog = delegator.findOne("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId), true);
if (prodCatalog != null) {
return "Y".equals(prodCatalog.getString("useQuickAdd"));
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java Sat May 12 21:20:13 2012
@@ -129,7 +129,7 @@ public class CategoryContentWrapper impl
ModelEntity categoryModel = delegator.getModelEntity("ProductCategory");
if (categoryModel.isField(candidateFieldName)) {
if (productCategory == null) {
- productCategory = delegator.findByPrimaryKeyCache("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
+ productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId), true);
}
if (productCategory != null) {
String candidateValue = productCategory.getString(candidateFieldName);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java Sat May 12 21:20:13 2012
@@ -69,7 +69,7 @@ public class CategoryServices {
List<GenericValue> members = null;
try {
- productCategory = delegator.findByPrimaryKeyCache("ProductCategory", UtilMisc.toMap("productCategoryId", categoryId));
+ productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", categoryId), true);
members = EntityUtil.filterByDate(productCategory.getRelatedCache("ProductCategoryMember", null, UtilMisc.toList("sequenceNum")), true);
if (Debug.verboseOn()) Debug.logVerbose("Category: " + productCategory + " Member Size: " + members.size() + " Members: " + members, module);
} catch (GenericEntityException e) {
@@ -105,7 +105,7 @@ public class CategoryServices {
GenericValue productCategory;
List<GenericValue> productCategoryMembers;
try {
- productCategory = delegator.findByPrimaryKeyCache("ProductCategory", UtilMisc.toMap("productCategoryId", categoryId));
+ productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", categoryId), true);
productCategoryMembers = delegator.findByAndCache(entityName, UtilMisc.toMap("productCategoryId", categoryId), orderByFields);
} catch (GenericEntityException e) {
Debug.logInfo(e, "Error finding previous/next product info: " + e.toString(), module);
@@ -254,7 +254,7 @@ public class CategoryServices {
GenericValue productCategory = null;
try {
- productCategory = delegator.findByPrimaryKeyCache("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
+ productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId), true);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
productCategory = null;
@@ -427,7 +427,7 @@ public class CategoryServices {
List<String> sortList = org.ofbiz.base.util.UtilMisc.toList("sequenceNum", "title");
try {
- GenericValue category = delegator.findByPrimaryKey(entityName ,UtilMisc.toMap(primaryKeyName, productCategoryId));
+ GenericValue category = delegator.findOne(entityName ,UtilMisc.toMap(primaryKeyName, productCategoryId), false);
if (UtilValidate.isNotEmpty(category)) {
if (isCatalog.equals("true") && isCategoryType.equals("false")) {
CategoryWorker.getRelatedCategories(request, "ChildCatalogList", CatalogWorker.getCatalogTopCategoryId(request, productCategoryId), true);
@@ -457,7 +457,7 @@ public class CategoryServices {
"parentProductCategoryId", catId)));
// Get the chosen category information for the categoryContentWrapper
- GenericValue cate = delegator.findByPrimaryKey("ProductCategory" ,UtilMisc.toMap("productCategoryId",catId));
+ GenericValue cate = delegator.findOne("ProductCategory" ,UtilMisc.toMap("productCategoryId",catId), false);
// If chosen category's child exists, then put the arrow before category icon
if (UtilValidate.isNotEmpty(childList)) {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Sat May 12 21:20:13 2012
@@ -367,7 +367,7 @@ public class CategoryWorker {
UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId)), true);
if (UtilValidate.isEmpty(productCategoryMembers)) {
//before giving up see if this is a variant product, and if so look up the virtual product and check it...
- GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
List<GenericValue> productAssocs = ProductWorker.getVariantVirtualAssocs(product);
//this does take into account that a product could be a variant of multiple products, but this shouldn't ever really happen...
if (productAssocs != null) {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java Sat May 12 21:20:13 2012
@@ -150,7 +150,7 @@ public class ProductConfigItemContentWra
ModelEntity productConfigItemModel = delegator.getModelEntity("ProductConfigItem");
if (productConfigItemModel.isField(candidateFieldName)) {
if (productConfigItem == null) {
- productConfigItem = delegator.findByPrimaryKeyCache("ProductConfigItem", UtilMisc.toMap("configItemId", configItemId));
+ productConfigItem = delegator.findOne("ProductConfigItem", UtilMisc.toMap("configItemId", configItemId), true);
}
if (productConfigItem != null) {
String candidateValue = productConfigItem.getString(candidateFieldName);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Sat May 12 21:20:13 2012
@@ -96,7 +96,7 @@ public class ProductConfigWrapper implem
}
private void init(Delegator delegator, LocalDispatcher dispatcher, String productId, String productStoreId, String catalogId, String webSiteId, String currencyUomId, Locale locale, GenericValue autoUserLogin) throws Exception {
- product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
if (product == null || !product.getString("productTypeId").equals("AGGREGATED") && !product.getString("productTypeId").equals("AGGREGATED_SERVICE")) {
throw new ProductConfigWrapperException("Product " + productId + " is not an AGGREGATED product.");
}
@@ -624,7 +624,7 @@ public class ProductConfigWrapper implem
String variantProductId = componentOptions.get(oneComponent.getString("productId"));
if (UtilValidate.isNotEmpty(variantProductId)) {
- oneComponentProduct = pcw.delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", variantProductId));
+ oneComponentProduct = pcw.delegator.findOne("Product", UtilMisc.toMap("productId", variantProductId), false);
}
// Get the component's price
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java Sat May 12 21:20:13 2012
@@ -92,7 +92,7 @@ public class ParametricSearch {
for (GenericValue productFeatureCatGrpAppl: productFeatureCatGrpAppls) {
List<GenericValue> productFeatureGroupAppls = delegator.findByAndCache("ProductFeatureGroupAppl", UtilMisc.toMap("productFeatureGroupId", productFeatureCatGrpAppl.get("productFeatureGroupId")));
for (GenericValue productFeatureGroupAppl: productFeatureGroupAppls) {
- GenericValue productFeature = delegator.findByPrimaryKeyCache("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureGroupAppl.get("productFeatureId")));
+ GenericValue productFeature = delegator.findOne("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureGroupAppl.get("productFeatureId")), true);
String productFeatureTypeId = productFeature.getString("productFeatureTypeId");
Map<String, GenericValue> featuresByType = productFeaturesByTypeMap.get(productFeatureTypeId);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java Sat May 12 21:20:13 2012
@@ -97,7 +97,7 @@ public class FrameImage {
String frameImageName = null;
try {
- GenericValue contentDataResourceView = delegator.findByPrimaryKey("ContentDataResourceView", UtilMisc.toMap("contentId", frameContentId, "drDataResourceId", frameDataResourceId));
+ GenericValue contentDataResourceView = delegator.findOne("ContentDataResourceView", UtilMisc.toMap("contentId", frameContentId, "drDataResourceId", frameDataResourceId), false);
frameImageName = contentDataResourceView.getString("contentName");
} catch (Exception e) {
Debug.logError(e, module);
@@ -357,7 +357,7 @@ public class FrameImage {
String frameImageName = null;
try {
- GenericValue contentDataResourceView = delegator.findByPrimaryKey("ContentDataResourceView", UtilMisc.toMap("contentId", frameContentId, "drDataResourceId", frameDataResourceId));
+ GenericValue contentDataResourceView = delegator.findOne("ContentDataResourceView", UtilMisc.toMap("contentId", frameContentId, "drDataResourceId", frameDataResourceId), false);
frameImageName = contentDataResourceView.getString("contentName");
} catch (Exception e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Sat May 12 21:20:13 2012
@@ -71,7 +71,7 @@ public class InventoryServices {
Locale locale = (Locale) context.get("locale");
try {
- inventoryItem = delegator.findByPrimaryKey("InventoryItem", UtilMisc.toMap("inventoryItemId", inventoryItemId));
+ inventoryItem = delegator.findOne("InventoryItem", UtilMisc.toMap("inventoryItemId", inventoryItemId), false);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"ProductNotFindInventoryItemWithId", locale) + inventoryItemId);
@@ -223,8 +223,8 @@ public class InventoryServices {
Locale locale = (Locale) context.get("locale");
try {
- inventoryTransfer = delegator.findByPrimaryKey("InventoryTransfer",
- UtilMisc.toMap("inventoryTransferId", inventoryTransferId));
+ inventoryTransfer = delegator.findOne("InventoryTransfer",
+ UtilMisc.toMap("inventoryTransferId", inventoryTransferId), false);
inventoryItem = inventoryTransfer.getRelatedOne("InventoryItem");
destinationFacility = inventoryTransfer.getRelatedOne("ToFacility");
} catch (GenericEntityException e) {
@@ -336,8 +336,8 @@ public class InventoryServices {
Locale locale = (Locale) context.get("locale");
try {
- inventoryTransfer = delegator.findByPrimaryKey("InventoryTransfer",
- UtilMisc.toMap("inventoryTransferId", inventoryTransferId));
+ inventoryTransfer = delegator.findOne("InventoryTransfer",
+ UtilMisc.toMap("inventoryTransferId", inventoryTransferId), false);
if (UtilValidate.isEmpty(inventoryTransfer)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"ProductInventoryItemTransferNotFound",
@@ -873,7 +873,7 @@ public class InventoryServices {
Map<String, String> contextInput = UtilMisc.toMap("productId", productId, "facilityId", facilityId, "statusId", statusId);
GenericValue product = null;
try {
- product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
} catch (GenericEntityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Sat May 12 21:20:13 2012
@@ -109,7 +109,7 @@ public class PriceServices {
GenericValue productStore = null;
try {
// we have a productStoreId, if the corresponding ProductStore.primaryStoreGroupId is not empty, use that
- productStore = delegator.findByPrimaryKeyCache("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
+ productStore = delegator.findOne("ProductStore", UtilMisc.toMap("productStoreId", productStoreId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Error getting product store info from the database while calculating price" + e.toString(), module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -278,7 +278,7 @@ public class PriceServices {
BigDecimal curDefaultPrice = curDefaultPriceValue.getBigDecimal("price");
if (minDefaultPrice == null || curDefaultPrice.compareTo(minDefaultPrice) < 0) {
// check to see if the product is discontinued for sale before considering it the lowest price
- GenericValue curVariantProduct = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", curVariantProductId));
+ GenericValue curVariantProduct = delegator.findOne("Product", UtilMisc.toMap("productId", curVariantProductId), true);
if (curVariantProduct != null) {
Timestamp salesDiscontinuationDate = curVariantProduct.getTimestamp("salesDiscontinuationDate");
if (salesDiscontinuationDate == null || salesDiscontinuationDate.after(nowTimestamp)) {
@@ -770,7 +770,7 @@ public class PriceServices {
productPriceRules = FastList.newInstance();
for (String productPriceRuleId: productPriceRuleIds) {
- GenericValue productPriceRule = delegator.findByPrimaryKeyCache("ProductPriceRule", UtilMisc.toMap("productPriceRuleId", productPriceRuleId));
+ GenericValue productPriceRule = delegator.findOne("ProductPriceRule", UtilMisc.toMap("productPriceRuleId", productPriceRuleId), true);
if (productPriceRule == null) continue;
productPriceRules.add(productPriceRule);
}
@@ -1165,8 +1165,8 @@ public class PriceServices {
} else if ("PRIP_ROLE_TYPE".equals(productPriceCond.getString("inputParamEnumId"))) {
if (partyId != null) {
// if a PartyRole exists for this partyId and the specified roleTypeId
- GenericValue partyRole = delegator.findByPrimaryKeyCache("PartyRole",
- UtilMisc.toMap("partyId", partyId, "roleTypeId", productPriceCond.getString("condValue")));
+ GenericValue partyRole = delegator.findOne("PartyRole",
+ UtilMisc.toMap("partyId", partyId, "roleTypeId", productPriceCond.getString("condValue")), true);
// then 0 (equals), otherwise 1 (not equals)
if (partyRole != null) {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java Sat May 12 21:20:13 2012
@@ -154,7 +154,7 @@ public class ProductContentWrapper imple
String candidateFieldName = ModelUtil.dbNameToVarName(productContentTypeId);
ModelEntity productModel = delegator.getModelEntity("Product");
if (product == null) {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
}
if (UtilValidate.isEmpty(product)) {
Debug.logWarning("No Product entity found for productId: " + productId, module);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java Sat May 12 21:20:13 2012
@@ -229,11 +229,11 @@ public class ProductEvents {
Timestamp fromDate = null;
try {
- if (delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId)) == null) {
+ if (delegator.findOne("Product", UtilMisc.toMap("productId", productId), false) == null) {
Map<String, String> messageMap = UtilMisc.toMap("productId", productId);
errMsgList.add(UtilProperties.getMessage(resource,"productevents.product_with_id_not_found", messageMap, UtilHttp.getLocale(request)));
}
- if (delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productIdTo)) == null) {
+ if (delegator.findOne("Product", UtilMisc.toMap("productId", productIdTo), false) == null) {
Map<String, String> messageMap = UtilMisc.toMap("productIdTo", productIdTo);
errMsgList.add(UtilProperties.getMessage(resource,"productevents.product_To_with_id_not_found", messageMap, UtilHttp.getLocale(request)));
}
@@ -432,7 +432,7 @@ public class ProductEvents {
if (variantProductId == null) {
// only single product to update
String productId = request.getParameter("productId");
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
product.set("lastModifiedDate", nowTimestamp);
product.setString("lastModifiedByUserLogin", userLogin.getString("userLoginId"));
try {
@@ -471,7 +471,7 @@ public class ProductEvents {
int attribIdx = 0;
String productId = variantProductId;
do {
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
try {
product.set("productHeight", parseBigDecimalForEntity(request.getParameter("productHeight" + attribIdx)));
product.set("productWidth", parseBigDecimalForEntity(request.getParameter("productWidth" + attribIdx)));
@@ -532,8 +532,8 @@ public class ProductEvents {
private static void setOrCreateProdFeature(Delegator delegator, String productId, List<GenericValue> currentProductFeatureAndAppls,
String uomId, String productFeatureTypeId, BigDecimal numberSpecified) throws GenericEntityException {
- GenericValue productFeatureType = delegator.findByPrimaryKey("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", productFeatureTypeId));
- GenericValue uom = delegator.findByPrimaryKey("Uom", UtilMisc.toMap("uomId", uomId));
+ GenericValue productFeatureType = delegator.findOne("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", productFeatureTypeId), false);
+ GenericValue uom = delegator.findOne("Uom", UtilMisc.toMap("uomId", uomId), false);
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
@@ -571,7 +571,7 @@ public class ProductEvents {
// if there is a productFeatureCategory with the same id as the productFeatureType, use that category.
// otherwise, use a default category from the configuration
- if (delegator.findByPrimaryKey("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureTypeId)) == null) {
+ if (delegator.findOne("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureTypeId), false) == null) {
GenericValue productFeatureCategory = delegator.makeValue("ProductFeatureCategory");
productFeatureCategory.set("productFeatureCategoryId", productFeatureTypeId);
productFeatureCategory.set("description", productFeatureType.get("description"));
@@ -604,7 +604,7 @@ public class ProductEvents {
try {
boolean beganTransaction = TransactionUtil.begin();
try {
- GenericValue productFeatureType = delegator.findByPrimaryKey("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", productFeatureTypeId));
+ GenericValue productFeatureType = delegator.findOne("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", productFeatureTypeId), false);
if (productFeatureType == null) {
String errMsg = "Error: the ProductFeature Type specified was not valid and one is require to add or update variant features.";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
@@ -615,9 +615,9 @@ public class ProductEvents {
if (variantProductId != null) {
// multiple products, so use a numeric suffix to get them all
int attribIdx = 0;
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
do {
- GenericValue variantProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", variantProductId));
+ GenericValue variantProduct = delegator.findOne("Product", UtilMisc.toMap("productId", variantProductId), false);
String description = request.getParameter("description" + attribIdx);
// blank means null, which means delete the feature application
if ((description != null) && (description.trim().length() < 1)) {
@@ -737,7 +737,7 @@ public class ProductEvents {
// if there is a productFeatureCategory with the same id as the productFeatureType, use that category.
// otherwise, create a category for the feature type
- if (delegator.findByPrimaryKey("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureTypeId)) == null) {
+ if (delegator.findOne("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureTypeId), false) == null) {
GenericValue productFeatureCategory = delegator.makeValue("ProductFeatureCategory");
productFeatureCategory.set("productFeatureCategoryId", productFeatureTypeId);
productFeatureCategory.set("description", productFeatureType.get("description"));
@@ -769,7 +769,7 @@ public class ProductEvents {
String productFeatureTypeId = request.getParameter("productFeatureTypeId");
try {
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
// get all the variants
List<GenericValue> variantAssocs = product.getRelatedByAnd("MainProductAssoc", UtilMisc.toMap("productAssocTypeId", "PRODUCT_VARIANT"));
variantAssocs = EntityUtil.filterByDate(variantAssocs);
@@ -1000,8 +1000,8 @@ public class ProductEvents {
GenericValue productStoreEmail = null;
try {
- productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting",
- UtilMisc.toMap("productStoreId", productStoreId, "emailType", emailType));
+ productStoreEmail = delegator.findOne("ProductStoreEmailSetting",
+ UtilMisc.toMap("productStoreId", productStoreId, "emailType", emailType), false);
} catch (GenericEntityException e) {
String errMsg = "Unable to get product store email setting for tell-a-friend: " + e.toString();
Debug.logError(e, errMsg, module);
@@ -1189,7 +1189,7 @@ public class ProductEvents {
GenericValue userLogin = null;
try {
- userLogin = delegator.findByPrimaryKeyCache("UserLogin", UtilMisc.toMap("userLoginId", "system"));
+ userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), true);
} catch (GenericEntityException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java Sat May 12 21:20:13 2012
@@ -159,7 +159,7 @@ public class ProductPromoContentWrapper
ModelEntity productModel = delegator.getModelEntity("ProductPromo");
if (productModel.isField(candidateFieldName)) {
if (UtilValidate.isEmpty(productPromo)) {
- productPromo = delegator.findByPrimaryKeyCache("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId));
+ productPromo = delegator.findOne("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId), true);
}
if (UtilValidate.isNotEmpty(productPromo)) {
String candidateValue = productPromo.getString(candidateFieldName);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java Sat May 12 21:20:13 2012
@@ -888,7 +888,7 @@ public class ProductSearch {
public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue prodCatalog = null;
try {
- prodCatalog = delegator.findByPrimaryKeyCache("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId));
+ prodCatalog = delegator.findOne("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Error finding ProdCatalog information for constraint pretty print", module);
}
@@ -969,7 +969,7 @@ public class ProductSearch {
public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productCategory = null;
try {
- productCategory = delegator.findByPrimaryKeyCache("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
+ productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Error finding ProductCategory information for constraint pretty print", module);
}
@@ -1054,7 +1054,7 @@ public class ProductSearch {
GenericValue productFeature = null;
GenericValue productFeatureType = null;
try {
- productFeature = delegator.findByPrimaryKeyCache("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId));
+ productFeature = delegator.findOne("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId), true);
productFeatureType = productFeature == null ? null : productFeature.getRelatedOne("ProductFeatureType");
} catch (GenericEntityException e) {
Debug.logError(e, "Error finding ProductFeature and Type information for constraint pretty print", module);
@@ -1136,7 +1136,7 @@ public class ProductSearch {
public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productFeatureCategory = null;
try {
- productFeatureCategory = delegator.findByPrimaryKeyCache("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId));
+ productFeatureCategory = delegator.findOne("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Error finding ProductFeatureCategory and Type information for constraint pretty print", module);
}
@@ -1217,7 +1217,7 @@ public class ProductSearch {
public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productFeatureGroup = null;
try {
- productFeatureGroup = delegator.findByPrimaryKeyCache("ProductFeatureGroup", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId));
+ productFeatureGroup = delegator.findOne("ProductFeatureGroup", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Error finding ProductFeatureGroup and Type information for constraint pretty print", module);
}
@@ -1311,7 +1311,7 @@ public class ProductSearch {
if (infoOut.length() > 0) {
infoOut.append(", ");
}
- GenericValue productFeature = delegator.findByPrimaryKeyCache("ProductFeature", UtilMisc.toMap("productFeatureId", featureId));
+ GenericValue productFeature = delegator.findOne("ProductFeature", UtilMisc.toMap("productFeatureId", featureId), true);
GenericValue productFeatureType = productFeature == null ? null : productFeature.getRelatedOneCache("ProductFeatureType");
if (productFeatureType == null) {
infoOut.append(UtilProperties.getMessage(resource, "ProductFeature", locale)).append(": ");
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Sat May 12 21:20:13 2012
@@ -122,7 +122,7 @@ public class ProductServices {
}
if (variantFound) {
try {
- products.add(delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", oneVariant.getString("productIdTo"))));
+ products.add(delegator.findOne("Product", UtilMisc.toMap("productId", oneVariant.getString("productIdTo")), false));
} catch (GenericEntityException e) {
Map<String, String> messageMap = UtilMisc.toMap("errProductFeatures", e.toString());
String errMsg = UtilProperties.getMessage(resourceError,"productservices.problem_reading_product_features_errors", messageMap, locale);
@@ -225,7 +225,7 @@ public class ProductServices {
GenericValue productTo = null;
try {
- productTo = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productIdTo));
+ productTo = delegator.findOne("Product", UtilMisc.toMap("productId", productIdTo), true);
} catch (GenericEntityException e) {
Debug.logError(e, module);
Map<String, String> messageMap = UtilMisc.toMap("productIdTo", productIdTo, "errMessage", e.toString());
@@ -409,7 +409,7 @@ public class ProductServices {
}
try {
- GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
GenericValue mainProduct = product;
if (product.get("isVariant") != null && product.getString("isVariant").equalsIgnoreCase("Y")) {
@@ -482,7 +482,7 @@ public class ProductServices {
GenericValue product = null;
try {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
} catch (GenericEntityException e) {
Map<String, String> messageMap = UtilMisc.toMap("errMessage", e.getMessage());
errMsg = UtilProperties.getMessage(resourceError,
@@ -672,8 +672,8 @@ public class ProductServices {
}
for (GenericValue featureAppl: features) {
try {
- GenericValue product = delegator.findByPrimaryKeyCache("Product",
- UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product",
+ UtilMisc.toMap("productId", productId), true);
tempSample.put(featureAppl.getString("description"), product);
} catch (GenericEntityException e) {
@@ -704,7 +704,7 @@ public class ProductServices {
try {
// read the product, duplicate it with the given id
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
if (product == null) {
Map<String, String> messageMap = UtilMisc.toMap("productId", productId);
errMsg = UtilProperties.getMessage(resourceError,
@@ -714,7 +714,7 @@ public class ProductServices {
return result;
}
// check if product exists
- GenericValue variantProduct = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", variantProductId));
+ GenericValue variantProduct = delegator.findOne("Product",UtilMisc.toMap("productId", variantProductId), false);
boolean variantProductExists = (variantProduct != null);
if (variantProduct == null) {
//if product does not exist
@@ -756,7 +756,7 @@ public class ProductServices {
while (st.hasMoreTokens()) {
String productFeatureId = st.nextToken();
- GenericValue productFeature = delegator.findByPrimaryKey("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId));
+ GenericValue productFeature = delegator.findOne("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId), false);
GenericValue productFeatureAppl = delegator.makeValue("ProductFeatureAppl",
UtilMisc.toMap("productId", variantProductId, "productFeatureId", productFeatureId,
@@ -841,7 +841,7 @@ public class ProductServices {
continue;
}
// is a Product.productId?
- GenericValue variantProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", variantProductId));
+ GenericValue variantProduct = delegator.findOne("Product", UtilMisc.toMap("productId", variantProductId), false);
if (variantProduct != null) {
variantProductsById.put(variantProductId, variantProduct);
} else {
@@ -917,7 +917,7 @@ public class ProductServices {
GenericValue inventoryItem = null;
try {
- inventoryItem = delegator.findByPrimaryKeyCache("InventoryItem", UtilMisc.toMap("inventoryItemId", inventoryItemId));
+ inventoryItem = delegator.findOne("InventoryItem", UtilMisc.toMap("inventoryItemId", inventoryItemId), true);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -927,7 +927,7 @@ public class ProductServices {
String productId = inventoryItem.getString("productId");
GenericValue product = null;
try {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -949,7 +949,7 @@ public class ProductServices {
// refresh the product so we can update it
GenericValue productToUpdate = null;
try {
- productToUpdate = delegator.findByPrimaryKey("Product", product.getPrimaryKey());
+ productToUpdate = delegator.findOne("Product", product.getPrimaryKey(), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Sat May 12 21:20:13 2012
@@ -77,7 +77,7 @@ public class ProductUtilServices {
int numSoFarOne = 0;
while ((productOne = eliOne.next()) != null) {
String virtualProductId = ProductWorker.getVariantVirtualId(productOne);
- GenericValue virtualProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", virtualProductId));
+ GenericValue virtualProduct = delegator.findOne("Product", UtilMisc.toMap("productId", virtualProductId), false);
if (virtualProduct == null) {
continue;
}
@@ -344,7 +344,7 @@ public class ProductUtilServices {
}
try {
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
Debug.logInfo("Processing virtual product with one variant with ID: " + productId + " and name: " + product.getString("internalName"), module);
List<GenericValue> paList = EntityUtil.filterByDate(delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productId", productId, "productAssocTypeId", "PRODUCT_VARIANT")));
@@ -382,7 +382,7 @@ public class ProductUtilServices {
String variantProductId = productAssoc.getString("productIdTo");
// Product
- GenericValue variantProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", variantProductId));
+ GenericValue variantProduct = delegator.findOne("Product", UtilMisc.toMap("productId", variantProductId), false);
Debug.logInfo("--variant has ID: " + variantProductId + " and name: " + variantProduct.getString("internalName"), module);
@@ -700,7 +700,7 @@ while (allCatIter.hasNext()) {
productFeatureGroupId = productFeatureGroupId.substring(0, 20);
}
- GenericValue productFeatureGroup = delegator.findByPrimaryKey("ProductFeatureGroup", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId));
+ GenericValue productFeatureGroup = delegator.findOne("ProductFeatureGroup", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId), false);
if (productFeatureGroup == null) {
// auto-create the group
String description = "Feature Group for type [" + productFeatureTypeId + "] features in category [" + productCategoryId + "]";
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Sat May 12 21:20:13 2012
@@ -147,7 +147,7 @@ public class ProductWorker {
}
public static String getInstanceAggregatedId(Delegator delegator, String instanceProductId) throws GenericEntityException {
- GenericValue instanceProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", instanceProductId));
+ GenericValue instanceProduct = delegator.findOne("Product", UtilMisc.toMap("productId", instanceProductId), false);
if (UtilValidate.isNotEmpty(instanceProduct) && EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", instanceProduct.getString("productTypeId"), "parentTypeId", "AGGREGATED")) {
GenericValue productAssoc = EntityUtil.getFirst(EntityUtil.filterByDate(instanceProduct.getRelatedByAnd("AssocProductAssoc",
@@ -173,7 +173,7 @@ public class ProductWorker {
}
public static List<GenericValue> getAggregatedAssocs(Delegator delegator, String aggregatedProductId) throws GenericEntityException {
- GenericValue aggregatedProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", aggregatedProductId));
+ GenericValue aggregatedProduct = delegator.findOne("Product", UtilMisc.toMap("productId", aggregatedProductId), false);
if (UtilValidate.isNotEmpty(aggregatedProduct) && ("AGGREGATED".equals(aggregatedProduct.getString("productTypeId")) || "AGGREGATED_SERVICE".equals(aggregatedProduct.getString("productTypeId")))) {
List<GenericValue> productAssocs = EntityUtil.filterByDate(aggregatedProduct.getRelatedByAnd("MainProductAssoc",
@@ -318,7 +318,7 @@ public class ProductWorker {
*/
public static String getGwpAlternativeOptionName(LocalDispatcher dispatcher, Delegator delegator, String alternativeOptionProductId, Locale locale) {
try {
- GenericValue alternativeOptionProduct = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", alternativeOptionProductId));
+ GenericValue alternativeOptionProduct = delegator.findOne("Product", UtilMisc.toMap("productId", alternativeOptionProductId), true);
if (alternativeOptionProduct != null) {
if ("Y".equals(alternativeOptionProduct.getString("isVariant"))) {
Set<GenericValue> distFeatures = getVariantDistinguishingFeatures(alternativeOptionProduct);
@@ -367,7 +367,7 @@ public class ProductWorker {
return null;
}
try {
- return getProductFeaturesByApplTypeId(delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId)),
+ return getProductFeaturesByApplTypeId(delegator.findOne("Product", UtilMisc.toMap("productId", productId), false),
productFeatureApplTypeId);
} catch (GenericEntityException e) {
Debug.logError(e, module);
@@ -403,7 +403,7 @@ public class ProductWorker {
public static String getProductVirtualVariantMethod(Delegator delegator, String productId) {
GenericValue product = null;
try {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -440,8 +440,8 @@ public class ProductWorker {
featureTypeFeatures.add(featureList);
featureList = FastList.newInstance();
}
- GenericValue productFeatureType = delegator.findByPrimaryKey("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId",
- productFeatureAppl.getString("productFeatureTypeId")));
+ GenericValue productFeatureType = delegator.findOne("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId",
+ productFeatureAppl.getString("productFeatureTypeId")), false);
featureList.add(UtilMisc.<String, String>toMap("productFeatureTypeId", productFeatureAppl.getString("productFeatureTypeId"),
"description", productFeatureType.getString("description")));
oldType = productFeatureAppl.getString("productFeatureTypeId");
@@ -597,7 +597,7 @@ public class ProductWorker {
public static BigDecimal getAverageProductRating(Delegator delegator, String productId, String productStoreId) {
GenericValue product = null;
try {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -679,7 +679,7 @@ public class ProductWorker {
public static List<GenericValue> getCurrentProductCategories(Delegator delegator, String productId) {
GenericValue product = null;
try {
- product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -759,7 +759,7 @@ public class ProductWorker {
public static boolean isVirtual(Delegator delegator, String productI) {
try {
- GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productI));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productI), true);
if (product != null) {
return "Y".equals(product.getString("isVirtual"));
}
@@ -772,7 +772,7 @@ public class ProductWorker {
public static boolean isAmountRequired(Delegator delegator, String productI) {
try {
- GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productI));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productI), true);
if (product != null) {
return "Y".equals(product.getString("requireAmount"));
}
@@ -785,7 +785,7 @@ public class ProductWorker {
public static String getProductTypeId(Delegator delegator, String productId) {
try {
- GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
if (product != null) {
return product.getString("productTypeId");
}
@@ -864,7 +864,7 @@ public class ProductWorker {
// 1) look if the idToFind given is a real productId
if (searchProductFirst) {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", idToFind));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", idToFind), true);
}
if (searchAllId || (searchProductFirst && UtilValidate.isEmpty(product))) {
@@ -877,7 +877,7 @@ public class ProductWorker {
}
if (! searchProductFirst) {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", idToFind));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", idToFind), true);
}
if (UtilValidate.isNotEmpty(product)) {
@@ -920,7 +920,7 @@ public class ProductWorker {
GenericValue productToAdd = product;
//retreive product GV if the actual genericValue came from viewEntity
if (! "Product".equals(product.getEntityName())) {
- productToAdd = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", product.get("productId")));
+ productToAdd = delegator.findOne("Product", UtilMisc.toMap("productId", product.get("productId")), true);
}
if (UtilValidate.isEmpty(products)) {
@@ -1056,7 +1056,7 @@ nextProd:
*/
if (!productFound) {
// copy product to be variant
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
product.put("isVariant", "Y");
product.put("isVirtual", "N");
product.put("productId", delegator.getNextSeqId("Product"));
@@ -1198,7 +1198,7 @@ nextProd:
public static boolean isAggregateService(Delegator delegator, String aggregatedProductId) {
try {
- GenericValue aggregatedProduct = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", aggregatedProductId));
+ GenericValue aggregatedProduct = delegator.findOne("Product", UtilMisc.toMap("productId", aggregatedProductId), true);
if (UtilValidate.isNotEmpty(aggregatedProduct) && "AGGREGATED_SERVICE".equals(aggregatedProduct.getString("productTypeId"))) {
return true;
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java Sat May 12 21:20:13 2012
@@ -84,7 +84,7 @@ public class VariantEvents {
try {
// read the product, duplicate it with the given id
- GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+ GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
if (product == null) {
Map<String, String> messageMap = UtilMisc.toMap("productId", productId);
errMsg = UtilProperties.getMessage(resource,"variantevents.product_not_found_with_ID", messageMap, UtilHttp.getLocale(request));
@@ -94,7 +94,7 @@ public class VariantEvents {
}
// check if product exists
- GenericValue variantProduct = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", variantProductId));
+ GenericValue variantProduct = delegator.findOne("Product",UtilMisc.toMap("productId", variantProductId), false);
if (variantProduct == null) {
//if product does not exist
variantProduct = GenericValue.create(product);
@@ -130,7 +130,7 @@ public class VariantEvents {
return "error";
}
- GenericValue productFeature = delegator.findByPrimaryKey("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId));
+ GenericValue productFeature = delegator.findOne("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId), false);
GenericValue productFeatureAppl = delegator.makeValue("ProductFeatureAppl",
UtilMisc.toMap("productId", variantProductId, "productFeatureId", productFeatureId,
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java Sat May 12 21:20:13 2012
@@ -91,7 +91,7 @@ public class PromoServices {
}
GenericValue existingPromoCode = null;
try {
- existingPromoCode = delegator.findByPrimaryKeyCache("ProductPromoCode", "productPromoCodeId", newPromoCodeId);
+ existingPromoCode = delegator.findOne("ProductPromoCode", UtilMisc.toMap("productPromoCodeId", newPromoCodeId), true);
}
catch (GenericEntityException e) {
Debug.logWarning("Could not find ProductPromoCode for just generated ID: " + newPromoCodeId, module);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java Sat May 12 21:20:13 2012
@@ -65,8 +65,8 @@ public class ImportProductHelper {
GenericValue tmpProductGV;
boolean productExists = false;
try {
- tmpProductGV = delegator.findByPrimaryKey("Product", UtilMisc
- .toMap("productId", productId));
+ tmpProductGV = delegator.findOne("Product", UtilMisc
+ .toMap("productId", productId), false);
if (tmpProductGV != null
&& productId.equals(tmpProductGV.getString("productId")))
productExists = true;
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Sat May 12 21:20:13 2012
@@ -61,7 +61,7 @@ public class ProductStoreWorker {
}
GenericValue productStore = null;
try {
- productStore = delegator.findByPrimaryKeyCache("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
+ productStore = delegator.findOne("ProductStore", UtilMisc.toMap("productStoreId", productStoreId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Problem getting ProductStore entity", module);
}
@@ -115,7 +115,7 @@ public class ProductStoreWorker {
public static String determineSingleFacilityForStore(Delegator delegator, String productStoreId) {
GenericValue productStore = null;
try {
- productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
+ productStore = delegator.findOne("ProductStore", UtilMisc.toMap("productStoreId", productStoreId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -166,7 +166,7 @@ public class ProductStoreWorker {
public static GenericValue getProductStorePaymentSetting(Delegator delegator, String productStoreId, String paymentMethodTypeId, String paymentServiceTypeEnumId, boolean anyServiceType) {
GenericValue storePayment = null;
try {
- storePayment = delegator.findByPrimaryKeyCache("ProductStorePaymentSetting", UtilMisc.toMap("productStoreId", productStoreId, "paymentMethodTypeId", paymentMethodTypeId, "paymentServiceTypeEnumId", paymentServiceTypeEnumId));
+ storePayment = delegator.findOne("ProductStorePaymentSetting", UtilMisc.toMap("productStoreId", productStoreId, "paymentMethodTypeId", paymentMethodTypeId, "paymentServiceTypeEnumId", paymentServiceTypeEnumId), true);
} catch (GenericEntityException e) {
Debug.logError(e, "Problems looking up store payment settings", module);
}
@@ -487,7 +487,7 @@ public class ProductStoreWorker {
// if the item is a variant, get its virtual productId
try {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
if ((product != null) && ("Y".equals(product.get("isVariant")))) {
if (parentProductId != null) {
virtualProductId = parentProductId;
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=1337671&r1=1337670&r2=1337671&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 Sat May 12 21:20:13 2012
@@ -134,7 +134,7 @@ public class SubscriptionServices {
try {
if (lastSubscription != null && !alwaysCreateNewRecord) {
Map<String, Object> updateSubscriptionMap = dctx.getModelService("updateSubscription").makeValid(newSubscription, ModelService.IN_PARAM);
- updateSubscriptionMap.put("userLogin", delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")));
+ updateSubscriptionMap.put("userLogin", delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), false));
Map<String, Object> updateSubscriptionResult = dispatcher.runSync("updateSubscription", updateSubscriptionMap);
result.put("subscriptionId", updateSubscriptionMap.get("subscriptionId"));
@@ -159,7 +159,7 @@ public class SubscriptionServices {
}
}
Map<String, Object> createSubscriptionMap = dctx.getModelService("createSubscription").makeValid(newSubscription, ModelService.IN_PARAM);
- createSubscriptionMap.put("userLogin", delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")));
+ createSubscriptionMap.put("userLogin", delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), false));
Map<String, Object> createSubscriptionResult = dispatcher.runSync("createSubscription", createSubscriptionMap);
if (ServiceUtil.isError(createSubscriptionResult)) {
@@ -257,7 +257,7 @@ public class SubscriptionServices {
"OrderErrorCannotGetOrderRoleEntity",
UtilMisc.toMap("itemMsgInfo", orderId), locale));
}
- orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));
+ orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false);
if (orderHeader == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
"OrderErrorNoValidOrderHeaderFoundForOrderId",
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java Sat May 12 21:20:13 2012
@@ -65,7 +65,7 @@ public class SupplierProductServices {
BigDecimal quantity =(BigDecimal) context.get("quantity");
String canDropShip = (String) context.get("canDropShip");
try {
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
if (product == null) {
results = ServiceUtil.returnSuccess();
results.put("supplierProducts",null);
@@ -76,7 +76,7 @@ public class SupplierProductServices {
// if there were no related SupplierProduct entities and the item is a variant, then get the SupplierProducts of the virtual parent product
if (supplierProducts.size() == 0 && product.getString("isVariant") != null && product.getString("isVariant").equals("Y")) {
String virtualProductId = ProductWorker.getVariantVirtualId(product);
- GenericValue virtualProduct = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", virtualProductId));
+ GenericValue virtualProduct = delegator.findOne("Product", UtilMisc.toMap("productId", virtualProductId), true);
if (virtualProduct != null) {
supplierProducts = virtualProduct.getRelatedCache("SupplierProduct");
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java Sat May 12 21:20:13 2012
@@ -41,7 +41,7 @@ public class InventoryItemTransferTest e
@Override
protected void setUp() throws Exception {
- userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system"));
+ userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), false);
}
@Override
@@ -68,7 +68,7 @@ public class InventoryItemTransferTest e
Map<String, Object> ctx = FastMap.newInstance();
String statusId = "IXF_COMPLETE";
ctx.put("inventoryTransferId", inventoryTransferId);
- String inventoryItemId = delegator.findByPrimaryKey("InventoryTransfer", UtilMisc.toMap("inventoryTransferId", inventoryTransferId)).getString("inventoryItemId");
+ String inventoryItemId = delegator.findOne("InventoryTransfer", UtilMisc.toMap("inventoryTransferId", inventoryTransferId), false).getString("inventoryItemId");
ctx.put("inventoryItemId", inventoryItemId);
ctx.put("statusId", statusId);
ctx.put("userLogin", userLogin);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java Sat May 12 21:20:13 2012
@@ -44,7 +44,7 @@ public class StockMovesTest extends OFBi
@Override
protected void setUp() throws Exception {
- userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system"));
+ userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), false);
}
@Override
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Sat May 12 21:20:13 2012
@@ -837,7 +837,7 @@ public class PackingSession implements j
protected void setPickerOnPicklist() throws GeneralException {
if (picklistBinId != null) {
// first find the picklist id
- GenericValue bin = this.getDelegator().findByPrimaryKey("PicklistBin", UtilMisc.toMap("picklistBinId", picklistBinId));
+ GenericValue bin = this.getDelegator().findOne("PicklistBin", UtilMisc.toMap("picklistBinId", picklistBinId), false);
if (bin != null) {
Map<String, Object> ctx = FastMap.newInstance();
ctx.put("picklistId", bin.getString("picklistId"));
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java Sat May 12 21:20:13 2012
@@ -212,7 +212,7 @@ public class PackingSessionLine implemen
itemLookup.put("orderItemSeqId", this.getOrderItemSeqId());
itemLookup.put("shipGroupSeqId", this.getShipGroupSeqId());
itemLookup.put("inventoryItemId", this.getInventoryItemId());
- GenericValue plItem = delegator.findByPrimaryKey("PicklistItem", itemLookup);
+ GenericValue plItem = delegator.findOne("PicklistItem", itemLookup, false);
if (plItem != null) {
Debug.logInfo("Found picklist bin: " + plItem, module);
BigDecimal itemQty = plItem.getBigDecimal("quantity");
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java Sat May 12 21:20:13 2012
@@ -51,7 +51,7 @@ public class ShipmentEvents {
GenericValue shipmentPackageRouteSeg = null;
try {
- shipmentPackageRouteSeg = delegator.findByPrimaryKey("ShipmentPackageRouteSeg", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentPackageSeqId", shipmentPackageSeqId));
+ shipmentPackageRouteSeg = delegator.findOne("ShipmentPackageRouteSeg", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentPackageSeqId", shipmentPackageSeqId), false);
} catch (GenericEntityException e) {
String errorMsg = "Error looking up ShipmentPackageRouteSeg: " + e.toString();
Debug.logError(e, errorMsg, module);