svn commit: r1858240 - /ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountForms.xml
Author: surajk Date: Sat Apr 27 05:49:12 2019 New Revision: 1858240 URL: http://svn.apache.org/viewvc?rev=1858240=rev Log: Improved: In AddFinAccountTrans selectable glAccountId values are sorted on glAccountId. (OFBIZ-10846) Thanks Pierre Smits for reporting, Pawan Verma for the patch and Jacques Le Roux for comment. Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountForms.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountForms.xml?rev=1858240=1858239=1858240=diff == --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountForms.xml Sat Apr 27 05:49:12 2019 @@ -211,7 +211,7 @@ under the License. - +
svn commit: r1858239 - /ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
Author: surajk
Date: Sat Apr 27 05:43:52 2019
New Revision: 1858239
URL: http://svn.apache.org/viewvc?rev=1858239=rev
Log:
Improved: Used ObjectType.simpleTypeConvert for all amount variables to make
sure proper type conversion in PaymentGatewayServices.java.
(OFBIZ-10811)
Thanks Jacques Le Roux for the review and Deepak Dixit for the initial idea.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1858239=1858238=1858239=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
Sat Apr 27 05:43:52 2019
@@ -34,6 +34,7 @@ import java.util.Set;
import org.apache.ofbiz.accounting.invoice.InvoiceWorker;
import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.ObjectType;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.UtilDateTime;
@@ -76,11 +77,11 @@ public class PaymentGatewayServices {
public static final String module = PaymentGatewayServices.class.getName();
public static final String AUTH_SERVICE_TYPE = "PRDS_PAY_AUTH";
-public static final String REAUTH_SERVICE_TYPE = "PRDS_PAY_REAUTH";
-public static final String RELEASE_SERVICE_TYPE = "PRDS_PAY_RELEASE";
-public static final String CAPTURE_SERVICE_TYPE = "PRDS_PAY_CAPTURE";
-public static final String REFUND_SERVICE_TYPE = "PRDS_PAY_REFUND";
-public static final String CREDIT_SERVICE_TYPE = "PRDS_PAY_CREDIT";
+private static final String REAUTH_SERVICE_TYPE = "PRDS_PAY_REAUTH";
+private static final String RELEASE_SERVICE_TYPE = "PRDS_PAY_RELEASE";
+private static final String CAPTURE_SERVICE_TYPE = "PRDS_PAY_CAPTURE";
+private static final String REFUND_SERVICE_TYPE = "PRDS_PAY_REFUND";
+private static final String CREDIT_SERVICE_TYPE = "PRDS_PAY_CREDIT";
private static final int TX_TIME = 300;
public static final int decimals =
UtilNumber.getBigDecimalScale("order.decimals");
public static final RoundingMode rounding =
UtilNumber.getRoundingMode("order.rounding");
@@ -184,7 +185,7 @@ public class PaymentGatewayServices {
// handle the response
if (authPaymentResult != null) {
// not null result means either an approval or decline; null
would mean error
-BigDecimal thisAmount = (BigDecimal)
authPaymentResult.get("processAmount");
+BigDecimal thisAmount = (BigDecimal)
ObjectType.simpleTypeOrObjectConvert(authPaymentResult.get("processAmount"),
"BigDecimal", null, locale);
// process the auth results
try {
@@ -1272,7 +1273,14 @@ public class PaymentGatewayServices {
}
if (captureResult != null) {
-BigDecimal amountCaptured = (BigDecimal)
captureResult.get("captureAmount");
+BigDecimal amountCaptured = BigDecimal.ZERO;
+try {
+amountCaptured = (BigDecimal)
ObjectType.simpleTypeOrObjectConvert(captureResult.get("captureAmount"),
"BigDecimal", null, locale);
+} catch (GeneralException e) {
+Debug.logError(e, "Trouble processing the result;
captureResult: " + captureResult, module);
+return
ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder,
+"AccountingPaymentCannotBeCaptured",
locale) + " " + captureResult);
+}
if (Debug.infoOn()) {
Debug.logInfo("Amount captured for order [" +
orderId + "] from unapplied payments associated to billing account [" +
billingAccountId + "] is: " + amountCaptured, module);
}
@@ -1378,7 +1386,10 @@ public class PaymentGatewayServices {
Map captureResult = capturePayment(dctx,
userLogin, orh, paymentPref, amountThisCapture, locale);
if (captureResult != null &&
ServiceUtil.isSuccess(captureResult)) {
// credit card processors return captureAmount, but gift
certificate processors return processAmount
-BigDecimal amountCaptured = (BigDecimal)
captureResult.get("captureAmount");
+
svn commit: r1858237 - /ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
Author: surajk
Date: Sat Apr 27 05:27:08 2019
New Revision: 1858237
URL: http://svn.apache.org/viewvc?rev=1858237=rev
Log:
Improved: Incorrect contact information displayed on purchase order view page.
(OFBIZ-5401)
It seems like the address information listed should relate to the party of the
screen, so the supplier contact information should probably appear.
Thanks Christian Carlow for reporting, Prakhar Kumar for the patch and everyone
else for discussions and suggestions.
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl?rev=1858237=1858236=1858237=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
Sat Apr 27 05:27:08 2019
@@ -101,11 +101,24 @@ under the License.
+ <#if orderHeader.orderTypeId == "PURCHASE_ORDER" &&
displayParty?has_content>
+<#assign supplierContactMech =
EntityQuery.use(delegator).from("PartyContactMechPurpose").where("partyId",
displayParty.partyId, "contactMechPurposeTypeId",
"BILLING_LOCATION").queryFirst()!>
+<#if supplierContactMech?has_content>
+ <#assign supplierAddress =
EntityQuery.use(delegator).from("PostalAddress").where("contactMechId",
supplierContactMech.contactMechId).queryOne()!>
+ ${uiLabelMap.OrderAddress}
+
+
+ ${setContextField("postalAddress", supplierAddress)}
+
${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")}
+
+
+
+
<#list orderContactMechValueMaps as orderContactMechValueMap>
<#assign contactMech = orderContactMechValueMap.contactMech>
<#assign contactMechPurpose =
orderContactMechValueMap.contactMechPurposeType>
-
+
${contactMechPurpose.get("description",locale)}
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/765 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1858223 Blamelist: jleroux Build succeeded! Sincerely, -The Buildbot
svn commit: r1858223 - /ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
Author: jleroux
Date: Fri Apr 26 18:51:09 2019
New Revision: 1858223
URL: http://svn.apache.org/viewvc?rev=1858223=rev
Log:
Improved: Java code contains unnecessary semicolons
(OFBIZ-10936)
Oops in previous commit missed that it's a Java not Groovy file :/
Modified:
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
Modified:
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java?rev=1858223=1858222=1858223=diff
==
---
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
Fri Apr 26 18:51:09 2019
@@ -1,88 +1,88 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.ofbiz.pricat.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.ofbiz.base.util.Debug;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFVMLDrawing;
-
-import com.microsoft.schemas.vml.CTShape;
-
-public final class OFBizPricatUtil {
-
-public static final String module = OFBizPricatUtil.class.getName();
-
-protected static Method VMLDrawingMethod;
-
-// for POI 4.0.0 and later, this field can be removed
-protected static Method FindCommentShapeMethod;
-
-static {
-Method[] methods = XSSFSheet.class.getDeclaredMethods();
-for (Method method : methods) {
-if (method.getName().equals("getVMLDrawing")) {
-VMLDrawingMethod = method;
-break;
-}
-}
-
-// for POI 4.0.0 and later, this part can be removed
-methods = XSSFVMLDrawing.class.getDeclaredMethods();
-for (Method method : methods) {
-if (method.getName().equals("findCommentShape")) {
-FindCommentShapeMethod = method;
-break;
-}
-}
-}
-
-public static void formatCommentShape(XSSFSheet sheet, CellReference cell)
{
-if (VMLDrawingMethod != null && FindCommentShapeMethod != null) {
-try {
-XSSFVMLDrawing vml = (XSSFVMLDrawing)
VMLDrawingMethod.invoke(sheet, true);
-/** for POI 4.0 and later, use:
-CTShape ctshape = vml.findCommentShape(cell.getRow(),
cell.getCol());
-*/
-CTShape ctshape = (CTShape) FindCommentShapeMethod.invoke(vml,
cell.getRow(), cell.getCol());
-ctshape.setType("#_x_t202");
-} catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
-Debug.logError(e, module)
-}
-}
-}
-
-public static void formatCommentShape(XSSFSheet sheet, int rowNum, short
colNum) {
-if (VMLDrawingMethod != null && FindCommentShapeMethod != null) {
-try {
-XSSFVMLDrawing vml = (XSSFVMLDrawing)
VMLDrawingMethod.invoke(sheet, true);
-/** for POI 4.0 and later, use:
-CTShape ctshape = vml.findCommentShape(rowNum, colNum);
-*/
-CTShape ctshape = (CTShape) FindCommentShapeMethod.invoke(vml,
rowNum, colNum);
-ctshape.setType("#_x_t202");
-} catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
-Debug.logError(e, module)
-}
-}
-}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/764 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1858220 Blamelist: jleroux BUILD FAILED: exception shell_1 upload_1 Sincerely, -The Buildbot
svn commit: r1858220 - in /ofbiz: ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/
Author: jleroux
Date: Fri Apr 26 18:09:39 2019
New Revision: 1858220
URL: http://svn.apache.org/viewvc?rev=1858220=rev
Log:
Improved: Java code contains unnecessary semicolons
(OFBIZ-10936)
Loosely related: Groovy code don't even needs them :)
Thanks: Mathieu for creating the Jira
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/WeightPackage.groovy
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy?rev=1858220=1858219=1858220=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
Fri Apr 26 18:09:39 2019
@@ -180,5 +180,5 @@ if (facility) {
if (!defaultWeightUomId) {
defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment",
"shipment.default.weight.uom", "WT_kg", delegator)
}
-context.defaultWeightUom = from("Uom").where("uomId",
defaultWeightUomId).cache().queryOne();;
+context.defaultWeightUom = from("Uom").where("uomId",
defaultWeightUomId).cache().queryOne()
context.defaultWeightUomId = defaultWeightUomId
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/WeightPackage.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/WeightPackage.groovy?rev=1858220=1858219=1858220=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/WeightPackage.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/WeightPackage.groovy
Fri Apr 26 18:09:39 2019
@@ -192,7 +192,7 @@ if (facility) {
if (!defaultDimensionUomId) {
defaultDimensionUomId = EntityUtilProperties.getPropertyValue("shipment",
"shipment.default.dimension.uom", "LEN_in", delegator)
}
-context.defaultDimensionUom = from("Uom").where("uomId",
defaultDimensionUomId).cache().queryOne();;
+context.defaultDimensionUom = from("Uom").where("uomId",
defaultDimensionUomId).cache().queryOne()
context.defaultDimensionUomId = defaultDimensionUomId
defaultWeightUomId = null
@@ -203,5 +203,5 @@ if (!defaultWeightUomId) {
defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment",
"shipment.default.weight.uom", "WT_kg", delegator)
}
-context.defaultWeightUom = from("Uom").where("uomId",
defaultWeightUomId).cache().queryOne();;
+context.defaultWeightUom = from("Uom").where("uomId",
defaultWeightUomId).cache().queryOne()
context.defaultWeightUomId = defaultWeightUomId
Modified:
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java?rev=1858220=1858219=1858220=diff
==
---
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java
Fri Apr 26 18:09:39 2019
@@ -66,7 +66,7 @@ public final class OFBizPricatUtil {
CTShape ctshape = (CTShape) FindCommentShapeMethod.invoke(vml,
cell.getRow(), cell.getCol());
ctshape.setType("#_x_t202");
} catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
-Debug.logError(e, module);;
+Debug.logError(e, module)
}
}
}
@@ -81,7 +81,7 @@ public final class OFBizPricatUtil {
CTShape ctshape = (CTShape) FindCommentShapeMethod.invoke(vml,
rowNum, colNum);
ctshape.setType("#_x_t202");
} catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
-Debug.logError(e, module);;
+Debug.logError(e, module)
}
}
}
svn commit: r1858181 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Author: jleroux
Date: Fri Apr 26 08:34:36 2019
New Revision: 1858181
URL: http://svn.apache.org/viewvc?rev=1858181=rev
Log:
"Applied fix from trunk for revision: 1858180"
r1858180 | jleroux | 2019-04-26 10:33:30 +0200 (ven. 26 avr. 2019) | 17 lignes
Reverted: Unknown request [images]; this request does not exist or cannot be
called directly.
(OFBIZ-10895)
Partially revert r1858094, just replaces "rmaps == null" by "rmaps.isEmpty()"
As Mathieu mentioned in dev:
<>
As I said in r1858094:
<>
We need now to review/check how it worked in R15 where it's OK, and possibly
implements the same
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 26 08:34:36 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1858181=1858180=1858181=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Fri Apr 26 08:34:36 2019
@@ -269,7 +269,7 @@ public class RequestHandler {
String overrideViewUri = getOverrideViewUri(path);
Collection rmaps = resolveURI(ccfg, request);
-if (rmaps == null) {
+if (rmaps.isEmpty()) {
if (throwRequestHandlerExceptionOnMissingLocalRequest) {
throw new RequestHandlerException(requestMissingErrorMessage);
} else {
svn commit: r1858180 - /ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Author: jleroux
Date: Fri Apr 26 08:33:30 2019
New Revision: 1858180
URL: http://svn.apache.org/viewvc?rev=1858180=rev
Log:
Reverted: Unknown request [images]; this request does not exist or cannot be
called directly.
(OFBIZ-10895)
Partially revert r1858094, just replaces "rmaps == null" by "rmaps.isEmpty()"
As Mathieu mentioned in dev:
<>
As I said in r1858094:
<>
We need now to review/check how it worked in R15 where it's OK, and possibly
implements the same
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1858180=1858179=1858180=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Fri Apr 26 08:33:30 2019
@@ -272,7 +272,7 @@ public class RequestHandler {
String overrideViewUri = getOverrideViewUri(path);
Collection rmaps = resolveURI(ccfg, request);
-if (rmaps == null) {
+if (rmaps.isEmpty()) {
if (throwRequestHandlerExceptionOnMissingLocalRequest) {
throw new RequestHandlerException(requestMissingErrorMessage);
} else {
