Author: hiranya
Date: Mon Jul 22 22:56:54 2013
New Revision: 1505842
URL: http://svn.apache.org/r1505842
Log:
Applying the patch for SYNAPSE-880
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java?rev=1505842&r1=1505841&r2=1505842&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
Mon Jul 22 22:56:54 2013
@@ -45,7 +45,12 @@ public class DataSourceFinder {
public static DataSource find(String dsName, Properties jndiEnv) {
try {
- Context context = new InitialContext(jndiEnv);
+ Context context;
+ if (jndiEnv == null) {
+ context = new InitialContext();
+ } else {
+ context = new InitialContext(jndiEnv);
+ }
return find(dsName, context);
} catch (NamingException e) {
