Ticket #11914: 11914.3.patch

eclipse/JOSM

@@ -12 +12 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--debug"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xverify:none"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xverify:none -Xmx2G"/>
 </launchConfiguration>

src/org/openstreetmap/josm/io/auth/CredentialsManager.java

@@ -131 +131 @@
                 UserIdentityManager.getInstance().setPartiallyIdentified(username);
             }
         }
+        purgeCredentialsCache(requestorType); // see #11914
         delegate.store(requestorType, host, credentials);
     }
 
@@ -137 +138 @@
     @Override
     public CredentialsAgentResponse getCredentials(RequestorType requestorType, String host, boolean noSuccessWithLastResponse)
             throws CredentialsAgentException {
-        return delegate.getCredentials(requestorType, host, noSuccessWithLastResponse);
+        CredentialsAgentResponse credentials = delegate.getCredentials(requestorType, host, noSuccessWithLastResponse);
+        if (requestorType == RequestorType.SERVER) {
+            // see #11914
+            String userName = credentials.getUsername();
+            userName = userName == null ? "" : userName.trim();
+            if (!Objects.equals(UserIdentityManager.getInstance().getUserName(), userName)) {
+                if (userName.isEmpty())
+                    UserIdentityManager.getInstance().setAnonymous();
+                else
+                    UserIdentityManager.getInstance().setPartiallyIdentified(userName);
+            }
+        }
+        return credentials;
     }
 
     @Override