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:52:33 UTC
cvs commit: jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore XConnectionKey.java
eckehard 2005/01/07 06:52:33
Modified: proposals/tamino/src/store/org/apache/slide/store/tamino/datastore
Tag: TWS421_BRANCH XConnectionKey.java
Log:
fixed missing domain problem
Revision Changes Path
No revision
No revision
1.1.4.1 +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.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XConnectionKey.java 25 Mar 2004 16:18:00 -0000 1.1
+++ XConnectionKey.java 7 Jan 2005 14:52:33 -0000 1.1.4.1
@@ -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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org