cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r416274 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java status.xml
Date Thu, 22 Jun 2006 06:51:09 GMT
Author: antonio
Date: Wed Jun 21 23:51:08 2006
New Revision: 416274

URL: http://svn.apache.org/viewvc?rev=416274&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/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java?rev=416274&r1=416273&r2=416274&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Wed Jun 21 23:51:08 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.
@@ -145,6 +147,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");
     }

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=416274&r1=416273&r2=416274&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Jun 21 23:51:08 2006
@@ -182,6 +182,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+    <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>
     <action dev="AG" type="fix" fixes-bug="COCOON-1864" due-to="Dennis Dam" due-to-emal="d.dam@hippo.nl">
       CForms Block: RepeaterJXPathBinding - order of row is inverted.
     </action>



Mime
View raw message