details: /erp/devel/pi/rev/0d4d27716b2a
changeset: 7414:0d4d27716b2a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon May 24 12:35:09 2010 +0200
summary: fixed bug 13315: prevent NPE
diffstat:
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diffs (40 lines):
diff -r 5c1a066b991f -r 0d4d27716b2a
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Mon May
24 15:41:02 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Mon May
24 12:35:09 2010 +0200
@@ -709,7 +709,7 @@
// calculate minimum required version of each extra module (installs &
updates)
minVersions = calcMinVersions(im);
- if (islocal) {
+ if (module == null) {
// set the selected module for obx installation
if (installOrig != null && installOrig.length > 0) {
module = installOrig[0];
@@ -882,21 +882,23 @@
if (!ak.isOPSInstance()) {
for (Module mod : im.getModulesToInstall()) {
if (mod.getIsCommercial()) {
- if (!mod.getModuleID().equals(selectedModule.getModuleID())) {
+ if (selectedModule != null &&
!mod.getModuleID().equals(selectedModule.getModuleID())) {
// Show only in case there are commercial dependencies
showNotActivatedError = true;
}
- } else if (mod.getModuleID().equals(selectedModule.getModuleID())) {
+ } else if (selectedModule != null
+ && !mod.getModuleID().equals(selectedModule.getModuleID())) {
selectedCommercial = true;
}
}
for (Module mod : im.getModulesToUpdate()) {
if (mod.getIsCommercial()) {
- if (!mod.getModuleID().equals(selectedModule.getModuleID())) {
+ if (selectedModule != null &&
!!mod.getModuleID().equals(selectedModule.getModuleID())) {
// Show only in case there are commercial dependencies
showNotActivatedError = true;
}
- } else if (mod.getModuleID().equals(selectedModule.getModuleID())) {
+ } else if (selectedModule != null
+ && !mod.getModuleID().equals(selectedModule.getModuleID())) {
selectedCommercial = true;
}
}
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
