Merge pull request #176 from tejones/teiiddes-1732

teiiddes-1732: Corrrected CP logic
Teiid-Designer · Jun 3, 2013 · f92477c · f92477c
2 parents c57d3ba + 7028dfd
commit f92477c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...r.datatools/src/org/teiid/designer/datatools/profiles/ws/ODataConnectionInfoProvider.java b/...r.datatools/src/org/teiid/designer/datatools/profiles/ws/ODataConnectionInfoProvider.java
@@ -37,6 +37,11 @@ public void setConnectionInfo(ModelResource modelResource,
         if (null != user) {
             connectionProps.setProperty(CONNECTION_NAMESPACE + ICredentialsCommon.USERNAME_PROP_ID, user);
         }
+
+        String password = props.getProperty(ICredentialsCommon.PASSWORD_PROP_ID);
+        if (null != password) {
+            connectionProps.setProperty(CONNECTION_NAMESPACE + ICredentialsCommon.PASSWORD_PROP_ID, password);
+        }
 
         String security = props.getProperty(ICredentialsCommon.SECURITY_TYPE_ID);
         if (security == null) {
@@ -93,7 +98,7 @@ public Properties getTeiidRelatedProperties(
         }
 
         String requestTimeout = props.getProperty(IWSProfileConstants.DS_REQUEST_TIMEOUT);
-        if (null != user) {
+        if (null != requestTimeout) {
             connectionProps.setProperty(IWSProfileConstants.DS_REQUEST_TIMEOUT, requestTimeout);
         }