# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: C:\Users\fm\Documents\NetBeansProjects\NetBeans\main-silver # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: o.n.bootstrap/apichanges.xml --- o.n.bootstrap/apichanges.xml +++ o.n.bootstrap/apichanges.xml @@ -85,6 +85,22 @@ + + + Property to replace DuplicateException with warning log only + + + + + +

+ See + netbeans.ignore.dupmodule + for details. +

+
+ +
Index: o.n.bootstrap/arch.xml --- o.n.bootstrap/arch.xml +++ o.n.bootstrap/arch.xml @@ -617,6 +617,15 @@ waits to synchronize with system clipboard. Defaults to 1000ms. +
  • + + By default ModuleManager throws DuplicateException when an attempt is made + to load an already loaded module. + One can change this behavior by providing -Dnetbeans.ignore.dupmodule=true + since version 2.63. When -Dnetbeans.ignore.dupmodule=true is provided, + attempt of duplicate loading is logged instead of throwing DuplicateException. + +
  • There are also some options passed to the launcher (interpreted Index: o.n.bootstrap/manifest.mf --- o.n.bootstrap/manifest.mf +++ o.n.bootstrap/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.bootstrap/1 -OpenIDE-Module-Specification-Version: 2.62 +OpenIDE-Module-Specification-Version: 2.63 OpenIDE-Module-Localizing-Bundle: org/netbeans/Bundle.properties OpenIDE-Module-Recommends: org.netbeans.NetigsoFramework Index: o.n.bootstrap/src/org/netbeans/ModuleManager.java --- o.n.bootstrap/src/org/netbeans/ModuleManager.java +++ o.n.bootstrap/src/org/netbeans/ModuleManager.java @@ -892,8 +892,14 @@ private void subCreate(Module m) throws DuplicateException { Module old = get(m.getCodeNameBase()); if (old != null) { + if (System.getProperty("netbeans.ignore.dupmodule", "false").equalsIgnoreCase("false")) { throw new DuplicateException(old, m); + } else { + // ignore duplicate module, log and gracefuly exit + Util.err.warning("Duplicate loading ignored: " + old + " and " + m); + return; } + } modules.add(m); modulesByName.put(m.getCodeNameBase(), m); providersOf.possibleProviderAdded(m);