You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2017/12/30 07:18:20 UTC
[incubator-netbeans] branch master updated: When running
PlatformDependencySatisfiedTest the mgr field can remain null
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 7a66f8e When running PlatformDependencySatisfiedTest the mgr field can remain null
7a66f8e is described below
commit 7a66f8e6a46d0ac32fdee974957406cf72856613
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Sat Dec 30 08:18:09 2017 +0100
When running PlatformDependencySatisfiedTest the mgr field can remain null
---
.../src/org/netbeans/core/startup/NbInstaller.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/core.startup/src/org/netbeans/core/startup/NbInstaller.java b/core.startup/src/org/netbeans/core/startup/NbInstaller.java
index e7b0df3..03bd396 100644
--- a/core.startup/src/org/netbeans/core/startup/NbInstaller.java
+++ b/core.startup/src/org/netbeans/core/startup/NbInstaller.java
@@ -230,13 +230,15 @@ final class NbInstaller extends ModuleInstaller {
List<Module.PackageExport> hiddenPackages = new ArrayList<Module.PackageExport>();
List<Module> mWithDeps = new LinkedList<Module>();
mWithDeps.add(m);
- mWithDeps.addAll(mgr.getAttachedFragments(m));
- for (Dependency d : m.getDependencies()) {
- if (d.getType() == Dependency.TYPE_MODULE) {
- Module _m = mgr.get((String) Util.parseCodeName(d.getName())[0]);
- assert _m != null : d;
- mWithDeps.add(_m);
- mWithDeps.addAll(mgr.getAttachedFragments(_m));
+ if (mgr != null) {
+ mWithDeps.addAll(mgr.getAttachedFragments(m));
+ for (Dependency d : m.getDependencies()) {
+ if (d.getType() == Dependency.TYPE_MODULE) {
+ Module _m = mgr.get((String) Util.parseCodeName(d.getName())[0]);
+ assert _m != null : d;
+ mWithDeps.add(_m);
+ mWithDeps.addAll(mgr.getAttachedFragments(_m));
+ }
}
}
for (Module _m : mWithDeps) {
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists