This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 3b6914c Temporary configuration takes precedence, does not fire
changes.
new 50076ae Merge pull request #3017 from sdedic/maven/hotfix-tests
3b6914c is described below
commit 3b6914cbef6848fde91289e69993f14290d4f686
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Thu Jun 24 22:02:10 2021 +0200
Temporary configuration takes precedence, does not fire changes.
---
.../netbeans/modules/maven/configurations/M2ConfigProvider.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
b/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
index db6b8eb..cc09849 100644
---
a/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
+++
b/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
@@ -260,8 +260,13 @@ public class M2ConfigProvider implements
ProjectConfigurationProvider<M2Configur
M2Configuration _active;
Collection<M2Configuration> confs;
Boolean b = inConfigInit.get();
+ _active = activeOverride.get();
+ if (_active != null) {
+ // explicit temporary override, skip all the 'is still there' &
fire change logic.
+ return _active;
+ }
synchronized (this) {
- _active = internalActive();
+ _active = active;
confs = getConfigurations(false);
String initAct = getInitialActive();
OUTER: if (initAct != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
