Return-Path: 
 <cvs-return-27405-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 38881 invoked from network); 22 Jun 2006 06:51:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Jun 2006 06:51:32 -0000
Received: (qmail 28632 invoked by uid 500); 22 Jun 2006 06:51:30 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 28576 invoked by uid 500); 22 Jun 2006 06:51:30 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 28565 invoked by uid 99); 22 Jun 2006 06:51:30 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jun 2006 23:51:30 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jun 2006 23:51:29 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id AEC341A9842; Wed, 21 Jun 2006 23:51:09 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: cvs@cocoon.apache.org
From: antonio@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060622065109.AEC341A9842@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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>