Index: trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 8824)
+++ trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 8827)
@@ -82,4 +82,8 @@
         private void processNoteComment(ProgressMonitor monitor, OsmApi api, Note note, NoteComment comment) {
             try {
+                if (updatedNotes.containsKey(note)) {
+                    // if note has been created earlier in this task, obtain its real id and not use the paceholder id
+                    note = updatedNotes.get(note);
+                }
                 Note newNote;
                 switch (comment.getNoteAction()) {