svn commit: r416283 - /cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java

[an...@apache.org]

Author: antonio
Date: Thu Jun 22 00:06:34 2006
New Revision: 416283

URL: http://svn.apache.org/viewvc?rev=416283&view=rev
Log:

<action dev="AG" type="fix" fixes-bug="COCOON-1862" due-to="Igor Naumov" due-to-emal="igornaumov@hotmail.com">
  HSQLDB Block: Workaround for HSQLDB improper shutdown in SAP NetWeaver.
</action>

Modified:
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java

Modified: cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java?rev=416283&r1=416282&r2=416283&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java Thu Jun 22 00:06:34 2006
@@ -34,6 +34,8 @@
 
 import org.apache.cocoon.Constants;
 import org.apache.cocoon.components.thread.RunnableManager;
+import org.hsqldb.Database;
+import org.hsqldb.DatabaseManager;
 
 /**
  * This class runs an instance of the HSQLDB HSQL protocol network database server.
@@ -143,6 +145,9 @@
     /** Stop the server */
     public void stop() {
         getLogger().debug("Shutting down HSQLDB");
+        // AG: Temporally workaround for http://issues.apache.org/jira/browse/COCOON-1862
+        // A newer version of hsqldb or SAP NetWeaver may not need the next line
+        DatabaseManager.closeDatabases(Database.CLOSEMODE_COMPACT);
         hsqlServer.stop();
         getLogger().debug("Shutting down HSQLDB: Done");
     }