You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ec...@apache.org on 2005/01/07 15:58:17 UTC
cvs commit: jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore XConnectionKey.java XConnectionPool.java
eckehard 2005/01/07 06:58:17
Modified: proposals/tamino/src/store/org/apache/slide/store/tamino/datastore
XConnectionKey.java XConnectionPool.java
Log:
fixed missing domain problem
Revision Changes Path
1.4 +13 -11 jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XConnectionKey.java
Index: XConnectionKey.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XConnectionKey.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XConnectionKey.java 30 Jul 2004 06:51:54 -0000 1.3
+++ XConnectionKey.java 7 Jan 2005 14:58:17 -0000 1.4
@@ -96,13 +96,15 @@
String namespace = slide.getNamespaceName();
XNamespaceConfig config = XDomainFileHandler.get().getNamespace(namespace).getConfig();
- String s = slide.getParameter(USER_ID);
- String user = s == null ? config.getAdminUser() : s;
- s = slide.getParameter(PASSWORD);
- String pwd = s == null ? config.getAdminPwd() : s;
+ String s_user = slide.getParameter(USER_ID);
+ String user = s_user == null ? config.getAdminUser() : s_user;
+ String s_password = slide.getParameter(PASSWORD);
+ String pwd = s_password == null ? config.getAdminPwd() : s_password;
- s = slide.getParameter(TAMINO_DOMAIN);
- String domain = s ==null ? config.getAdminDomain() : s;
+ String s_domain = slide.getParameter(TAMINO_DOMAIN);
+ String domain = null;
+ if (s_user != null) domain = s_domain ==null ? "" : s_domain;
+ else domain = s_domain ==null ? config.getAdminDomain() : s_domain;
init (sb.toString(), domain, user, pwd, privateKey);
}
1.5 +10 -5 jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XConnectionPool.java
Index: XConnectionPool.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XConnectionPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XConnectionPool.java 13 Oct 2004 16:11:36 -0000 1.4
+++ XConnectionPool.java 7 Jan 2005 14:58:17 -0000 1.5
@@ -148,7 +148,12 @@
TConnectionPoolDescriptor descriptor = new TConnectionPoolDescriptor();
descriptor.setDatabaseURI (conKey.getDatabaseUri() );
+ String mydomain = conKey.getDomain();
descriptor.setUser (conKey.getUser());
+ if (mydomain != null && ("".equals (mydomain) == false)) descriptor.setDomain(conKey.getDomain());
+ else {
+ if (conKey.getUser() != null) descriptor.setDomain("");
+ }
descriptor.setPassword (conKey.getPwd());
descriptor.setInitConnections (initConnection);
descriptor.setMaxConnections (maxConnection);
@@ -201,7 +206,7 @@
else {
TConnectionFactory connectionFactory = TConnectionFactory.getInstance();
String domain = conKey.getDomain();
- if (domain != null && "".equals (domain) == false) {
+ if (domain != null && ("".equals (domain) == false)) {
tCon = connectionFactory.newConnection (conKey.getDatabaseUri(),
domain,
conKey.getUser(),
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org