eckehard 2005/01/07 06:50:38
Modified:
proposals/tamino/src/store/org/apache/slide/store/tamino/datastore
Tag: TWS421_BRANCH XConnectionPool.java
Log:
fixed missing domain problem
Revision Changes Path
No revision
No revision
1.1.4.1 +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.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XConnectionPool.java 25 Mar 2004 16:18:00 -0000 1.1
+++ XConnectionPool.java 7 Jan 2005 14:50:38 -0000 1.1.4.1
@@ -141,7 +141,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);
@@ -194,7 +199,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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
