This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 40ad049 Fixing failing nb-javac tests.
new 434a262 Merge pull request #2763 from
dbalek/dbalek/fix-for-nb-javac-tests
40ad049 is described below
commit 40ad0491ffd7dd640c09c17e5d6008aeec1e944e
Author: Dusan Balek <[email protected]>
AuthorDate: Tue Feb 16 11:21:40 2021 +0100
Fixing failing nb-javac tests.
---
.../src/org/netbeans/modules/java/source/save/CasualDiff.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
index edbce4c..657cb7f 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
@@ -1422,7 +1422,7 @@ public class CasualDiff {
// check that it is not enum constant. If so, match it in special way
if ((oldT.mods.flags & Flags.ENUM) != 0) {
JCModifiers mods = oldT.getModifiers();
- int startPos = mods.pos != Position.NOPOS ? getOldPos(mods) :
getOldPos(parent);
+ int startPos = mods.pos != Position.NOPOS ? getOldPos(mods) :
getOldPos(oldT);
localPointer = diffAnnotationsLists(mods.getAnnotations(),
newT.getModifiers().getAnnotations(), startPos, localPointer);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
