Hi Devs,
Please find the correct svn diff.
Thanks,
Madhawa
On Mon, May 11, 2015 at 4:51 PM, Madhawa Gunasekara <[email protected]>
wrote:
> Hi Devs,
>
> Please review and commit, Please find the attached svn diff for the JIRA
> issue https://wso2.org/jira/browse/CARBON-15239
>
>
> Thanks,
> Madhawa
> --
> *Madhawa Gunasekara*
> Software Engineer
> WSO2 Inc.; http://wso2.com
> lean.enterprise.middleware
>
> mobile: +94 719411002 <+94+719411002>
> blog: *http://madhawa-gunasekara.blogspot.com
> <http://madhawa-gunasekara.blogspot.com>*
> linkedin: *http://lk.linkedin.com/in/mgunasekara
> <http://lk.linkedin.com/in/mgunasekara>*
>
--
*Madhawa Gunasekara*
Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware
mobile: +94 719411002 <+94+719411002>
blog: *http://madhawa-gunasekara.blogspot.com
<http://madhawa-gunasekara.blogspot.com>*
linkedin: *http://lk.linkedin.com/in/mgunasekara
<http://lk.linkedin.com/in/mgunasekara>*
Index: core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java
===================================================================
--- core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java (revision 212341)
+++ core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java (working copy)
@@ -202,8 +202,14 @@
}
props.setDefaultCatalog(config.getDefaultCatalog());
props.setDriverClassName(config.getDriverClassName());
- props.setUsername(config.getUsername());
- props.setPassword(config.getPassword());
+ String username = config.getUsername();
+ if (null != username && !("").equals(username)) {
+ props.setUsername(username);
+ String password = config.getPassword();
+ if (null != password && !("").equals(password)) {
+ props.setPassword(password);
+ }
+ }
if (config.getMaxActive() != null) {
props.setMaxActive(config.getMaxActive());
}
_______________________________________________
Dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/dev
