Author: adietish
Date: 2012-10-18 03:15:36 -0400 (Thu, 18 Oct 2012)
New Revision: 44571
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
Log:
[JBIDE-12855][JBIDE-12888][JBIDE-12889] corrected connection lookup to use
#getExpressConnectionUrl instead of #getExpressUsername
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-18
05:37:54 UTC (rev 44570)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-18
07:15:36 UTC (rev 44571)
@@ -129,14 +129,14 @@
*/
public static IApplication getApplication(IServer server) {
final String appName = getExpressApplicationName(server);
- final String userName = getExpressUsername(server);
+ final String connectionUrl = getExpressConnectionUrl(server);
try {
- final Connection ud = ConnectionsModel.getDefault().getConnectionByUrl(userName);
+ final Connection ud =
ConnectionsModel.getDefault().getConnectionByUrl(connectionUrl);
if (ud != null) {
return ud.getApplicationByName(appName); // May be long running
}
} catch (OpenShiftException e) {
- Logger.error(NLS.bind("Failed to retrieve application ''{0}''
from user ''{1}}'", appName, userName), e);
+ Logger.error(NLS.bind("Failed to retrieve application ''{0}'' at
url ''{1}}'", appName, connectionUrl), e);
}
return null;
}
@@ -449,8 +449,8 @@
public static IApplication findApplicationForServer(IServerAttributes server) {
try {
- String user = ExpressServerUtils.getExpressUsername(server);
- Connection connection = ConnectionsModel.getDefault().getConnectionByUrl(user);
+ String connectionUrl = ExpressServerUtils.getExpressConnectionUrl(server);
+ Connection connection =
ConnectionsModel.getDefault().getConnectionByUrl(connectionUrl);
String appName = ExpressServerUtils.getExpressApplicationName(server);
IApplication app = connection == null ? null :
connection.getApplicationByName(appName);
return app;
Show replies by date