Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2014-03-23 20:04:14 +0000
committerEike Stepper2014-03-23 20:07:46 +0000
commit1a3f3e006c466b518b8c198d98e1f60f07316c52 (patch)
tree9da90bfdd2375541edb1234063c5231fd5cae796 /plugins
parent89328e78491b839545ceffd6b81c7d3f3f2ccd5c (diff)
downloadcdo-1a3f3e006c466b518b8c198d98e1f60f07316c52.tar.gz
cdo-1a3f3e006c466b518b8c198d98e1f60f07316c52.tar.xz
cdo-1a3f3e006c466b518b8c198d98e1f60f07316c52.zip
Improve setup related models; make "" and null equal in MylynQueriesTask
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MylynQueriesTaskImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MylynQueriesTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MylynQueriesTaskImpl.java
index 16d5b2a331..3caea30ef7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MylynQueriesTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MylynQueriesTaskImpl.java
@@ -622,7 +622,7 @@ public class MylynQueriesTaskImpl extends SetupTaskImpl implements MylynQueriesT
private boolean isQueryDifferent(Query query, RepositoryQuery repositoryQuery) throws Exception
{
- String url = query.getURL();
+ String url = StringUtil.safe(query.getURL());
if (!ObjectUtil.equals(repositoryQuery.getUrl(), url))
{
return true;
@@ -639,7 +639,7 @@ public class MylynQueriesTaskImpl extends SetupTaskImpl implements MylynQueriesT
private void configureQuery(SetupTaskContext context, Query query, RepositoryQuery repositoryQuery)
{
- String url = query.getURL();
+ String url = StringUtil.safe(query.getURL());
if (!ObjectUtil.equals(url, repositoryQuery.getUrl()))
{
context.log("Setting query URL = " + url);

Back to the top