You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2020/02/23 11:27:07 UTC
[ofbiz-framework] branch release17.12 updated: Fix build failure
for release17.12
This is an automated email from the ASF dual-hosted git repository.
deepak pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release17.12 by this push:
new 1a8903e Fix build failure for release17.12
1a8903e is described below
commit 1a8903e1d529540238798ce234b39c8f45256cb1
Author: Deepak Dixit <de...@apache.org>
AuthorDate: Sun Feb 23 16:56:57 2020 +0530
Fix build failure for release17.12
---
applications/product/servicedef/services_pricepromo.xml | 1 +
.../src/main/java/org/apache/ofbiz/product/price/PriceServices.java | 1 +
.../src/main/java/org/apache/ofbiz/common/login/LoginServices.java | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/applications/product/servicedef/services_pricepromo.xml b/applications/product/servicedef/services_pricepromo.xml
index 2c125de..5b67bec 100644
--- a/applications/product/servicedef/services_pricepromo.xml
+++ b/applications/product/servicedef/services_pricepromo.xml
@@ -323,6 +323,7 @@ under the License.
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/>
<attribute name="amount" type="BigDecimal" mode="IN" optional="true"/>
+ <attribute name="agreementId" type="String" mode="IN" optional="true"/>
<attribute name="price" type="BigDecimal" mode="OUT" optional="false"/>
<attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/>
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
index 25b70db..9fb8580 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
@@ -1217,6 +1217,7 @@ public class PriceServices {
GenericValue product = (GenericValue)context.get("product");
String productId = product.getString("productId");
+ String agreementId = (String)context.get("agreementId");
String currencyUomId = (String)context.get("currencyUomId");
String partyId = (String)context.get("partyId");
BigDecimal quantity = (BigDecimal)context.get("quantity");
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
index 5173333..7e47402 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
@@ -437,6 +437,9 @@ public class LoginServices {
public static void createUserLoginPasswordHistory(GenericValue userLogin) throws GenericEntityException{
int passwordChangeHistoryLimit = 0;
+ Delegator delegator = userLogin.getDelegator();
+ String userLoginId = userLogin.getString("userLoginId");
+ String currentPassword = userLogin.getString("currentPassword");
try {
passwordChangeHistoryLimit = EntityUtilProperties.getPropertyAsInteger("security", "password.change.history.limit", 0).intValue();
} catch (NumberFormatException nfe) {
@@ -942,9 +945,6 @@ public class LoginServices {
}
int passwordChangeHistoryLimit = 0;
- Delegator delegator = userLogin.getDelegator();
- String userLoginId = userLogin.getString("userLoginId");
- String currentPassword = userLogin.getString("currentPassword");
try {
passwordChangeHistoryLimit = EntityUtilProperties.getPropertyAsInteger("security", "password.change.history.limit", 0).intValue();
} catch (NumberFormatException nfe) {