From b811cde27af0b27a94d7d8975d5e55021972cc8b Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 14 Nov 2019 21:34:17 +0700 Subject: [PATCH] IDEMPIERE-4105:fix out of bound exception when don't append "comment" --- .../org/adempiere/pipo/srv/PipoDictionaryService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java index c44f5058c6..74f34bf8f2 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java @@ -71,8 +71,9 @@ public class PipoDictionaryService implements IDictionaryService { if (versionSeparatorPos > 0) { int dotPos = fileName.lastIndexOf("."); if (dotPos > 0 && dotPos > versionSeparatorPos) { - if (fileName.indexOf("_") != fileName.lastIndexOf("_")) - dotPos=fileName.lastIndexOf("_"); + int extraInfoIndex = fileName.indexOf("_", versionSeparatorPos + 6); + if (extraInfoIndex > 0) + dotPos=extraInfoIndex; String version = fileName.substring(versionSeparatorPos+"2Pack_".length(), dotPos); if (version.split("[.]").length == 3) { @@ -123,7 +124,9 @@ public class PipoDictionaryService implements IDictionaryService { try { Trx.get(trxName, false).close(); } catch (Exception e) {} - adPackageImp.save(); // ignoring exceptions + + if (adPackageImp != null) + adPackageImp.save(); // ignoring exceptions if (adPackageImp != null && packIn != null) { // Add the attachment to the packin for possible reprocessing