[jbosstools-commits] JBoss Tools SVN: r41637 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console.

[jbosstools-commits at lists.jboss.org]

Author: xcoulon
Date: 2012-06-01 12:52:19 -0400 (Fri, 01 Jun 2012)
New Revision: 41637

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
Log:
Fixed - JBIDE-12043
Problems when changing user name on OpenShift Explorer

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java	2012-06-01 16:48:40 UTC (rev 41636)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java	2012-06-01 16:52:19 UTC (rev 41637)
@@ -158,7 +158,8 @@
 				if (returnCode == Window.OK) {
 					Logger.debug("OpenShift Auth succeeded.");
 					UserDelegate created = connectToOpenShiftWizard.getUser();
-					if( created != null ) {
+					// make sure this delegate gets the underlying user if auth succeeded and username was not changed in the wizard (ie, login with another account)
+					if( created != null && getUsername().equals(created.getUsername()) ) {
 						setDelegate(created.getDelegate());
 						setConnected(true);
 						setRememberPassword(created.isRememberPassword());