svn commit: r744660 - /synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java

[veithen]

Author: veithen
Date: Sun Feb 15 12:14:59 2009
New Revision: 744660

URL: http://svn.apache.org/viewvc?rev=744660&view=rev
Log:
SYNAPSE-504: Fix faulty if guard for setting ds catalog.

Modified:
    
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java

Modified: 
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java?rev=744660&r1=744659&r2=744660&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
 (original)
+++ 
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
 Sun Feb 15 12:14:59 2009
@@ -114,7 +114,7 @@
             }
 
             String defaultCatalog = information.getDefaultCatalog();
-            if (defaultCatalog != null || !"".equals(defaultCatalog)) {
+            if (defaultCatalog != null && !"".equals(defaultCatalog)) {
                 basicDataSource.setDefaultCatalog(defaultCatalog);
             }