Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa
diff options
context:
space:
mode:
authortle2007-04-26 00:24:19 +0000
committertle2007-04-26 00:24:19 +0000
commit15828e15e171abb6a473ef4720d82833107de723 (patch)
tree7c2d52c68aefacb6c7b5c2a54ee605aaf21cd889 /jpa
parent8aaf5f108b489ca4bf4913f57359e0904dc9248d (diff)
downloadwebtools.dali-15828e15e171abb6a473ef4720d82833107de723.tar.gz
webtools.dali-15828e15e171abb6a473ef4720d82833107de723.tar.xz
webtools.dali-15828e15e171abb6a473ef4720d82833107de723.zip
Changed setCatalogName to accept null name.
Diffstat (limited to 'jpa')
-rw-r--r--jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/ConnectionProfile.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/ConnectionProfile.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/ConnectionProfile.java
index 91cc4a8934..6016824c5e 100644
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/ConnectionProfile.java
+++ b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/ConnectionProfile.java
@@ -151,11 +151,13 @@ public abstract class ConnectionProfile extends DTPWrapper {
return;
}
if( this.database.supportsCatalogs()) {
- Catalog catalog = this.database.catalogNamed( catalogName);
+ String name = ( catalogName != null) ? catalogName : this.database.getDefaultCatalogName();
+
+ Catalog catalog = this.database.catalogNamed( name);
if( catalog == null) {
throw new NoSuchElementException();
}
- this.catalogName = catalogName;
+ this.catalogName = name;
this.database.refresh();
this.catalogChanged( catalog, this.database, ICatalogObjectListener.EventTypeEnumeration.ELEMENT_REFRESH);
}

Back to the top