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/05/30 11:55:29 UTC
svn commit: r661622 - in /jackrabbit/branches/1.4/jackrabbit-core: ./
src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java
src/main/java/org/apache/jackrabbit/core/persistence/db/DerbyPersistenceManager.java
Author: jukka
Date: Fri May 30 02:55:29 2008
New Revision: 661622
URL: http://svn.apache.org/viewvc?rev=661622&view=rev
Log:
1.4: Merged revision 658583 (JCR-1557)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DerbyPersistenceManager.java
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
svn:mergeinfo = /jackrabbit/trunk/jackrabbit-core:658583
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java?rev=661622&r1=661621&r2=661622&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java Fri May 30 02:55:29 2008
@@ -98,7 +98,16 @@
*/
protected void closeConnection(Connection connection) throws SQLException {
// prepare connection url for issuing shutdown command
- String url = connection.getMetaData().getURL();
+ String url;
+ try {
+ url = connection.getMetaData().getURL();
+ } catch (SQLException e) {
+ // JCR-1557: embedded derby db probably already shut down;
+ // this happens when configuring multiple FS/PM instances
+ // to use the same embedded derby db instance.
+ log.debug("failed to retrieve connection url: embedded db probably already shut down", e);
+ return;
+ }
int pos = url.lastIndexOf(';');
if (pos != -1) {
// strip any attributes from connection url
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DerbyPersistenceManager.java?rev=661622&r1=661621&r2=661622&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DerbyPersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DerbyPersistenceManager.java Fri May 30 02:55:29 2008
@@ -106,7 +106,16 @@
*/
protected void closeConnection(Connection connection) throws SQLException {
// prepare connection url for issuing shutdown command
- String url = connection.getMetaData().getURL();
+ String url;
+ try {
+ url = connection.getMetaData().getURL();
+ } catch (SQLException e) {
+ // JCR-1557: embedded derby db probably already shut down;
+ // this happens when configuring multiple FS/PM instances
+ // to use the same embedded derby db instance.
+ log.debug("failed to retrieve connection url: embedded db probably already shut down", e);
+ return;
+ }
int pos = url.lastIndexOf(';');
if (pos != -1) {
// strip any attributes from connection url