You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/02/29 16:20:38 UTC
svn commit: r632349 -
/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
Author: jukka
Date: Fri Feb 29 07:20:34 2008
New Revision: 632349
URL: http://svn.apache.org/viewvc?rev=632349&view=rev
Log:
1.3: Merged revisions 613799 and 613812 (JCR-1305)
Modified:
jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java?rev=632349&r1=632348&r2=632349&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java Fri Feb 29 07:20:34 2008
@@ -57,7 +57,11 @@
// JNDI context
Context context = (Context) d.newInstance();
DataSource ds = (DataSource) context.lookup(url);
- return ds.getConnection(user, password);
+ if (user == null && password == null) {
+ return ds.getConnection();
+ } else {
+ return ds.getConnection(user, password);
+ }
} else {
try {
// Workaround for Apache Derby: