Return-Path: 
 <core-commits-return-6345-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 67417 invoked from network); 8 Oct 2008 08:30:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Oct 2008 08:30:20 -0000
Received: (qmail 90433 invoked by uid 500); 8 Oct 2008 08:30:19 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 90406 invoked by uid 500); 8 Oct 2008 08:30:19 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 90397 invoked by uid 99); 8 Oct 2008 08:30:19 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Oct 2008 01:30:19 -0700
X-ASF-Spam-Status: No, hits=-1999.9 required=10.0
	tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Oct 2008 08:29:24 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 13EAD2388961; Wed,  8 Oct 2008 01:30:00 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r702753 - in /hadoop/core/branches/branch-0.19: ./
 .eclipse.templates/ lib/ src/examples/org/apache/hadoop/examples/
Date: Wed, 08 Oct 2008 08:29:59 -0000
To: core-commits@hadoop.apache.org
From: enis@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081008083000.13EAD2388961@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: enis
Date: Wed Oct  8 01:29:59 2008
New Revision: 702753

URL: http://svn.apache.org/viewvc?rev=702753&view=rev
Log:
Merge -r702751:702752 from trunk to branch-0.19. Fixes HADOOP-4267. 

Added:
    hadoop/core/branches/branch-0.19/lib/hsqldb-1.8.0.10.LICENSE.txt
      - copied unchanged from r702752, hadoop/core/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt
    hadoop/core/branches/branch-0.19/lib/hsqldb-1.8.0.10.jar
      - copied unchanged from r702752, hadoop/core/trunk/lib/hsqldb-1.8.0.10.jar
Removed:
    hadoop/core/branches/branch-0.19/lib/hsqldb-LICENSE.txt
    hadoop/core/branches/branch-0.19/lib/hsqldb.jar
Modified:
    hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java

Modified: hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath?rev=702753&r1=702752&r2=702753&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath (original)
+++ hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath Wed Oct  8 01:29:59 2008
@@ -19,7 +19,7 @@
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-net-1.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb.jar"/>
+	<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 	<classpathentry kind="lib" path="lib/jets3t-0.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-5.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-ext/commons-el.jar"/>

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=702753&r1=702752&r2=702753&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Wed Oct  8 01:29:59 2008
@@ -813,6 +813,9 @@
     HADOOP-4256. Removes Completed and Failed Job tables from 
     jobqueue_details.jsp. (Sreekanth Ramakrishnan via ddas)
 
+    HADOOP-4267. Occasional exceptions during shutting down HSQLDB is logged 
+    but not rethrown. (enis) 
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java?rev=702753&r1=702752&r2=702753&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java (original)
+++ hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java Wed Oct  8 01:29:59 2008
@@ -49,6 +49,7 @@
 import org.apache.hadoop.mapred.lib.db.DBInputFormat;
 import org.apache.hadoop.mapred.lib.db.DBOutputFormat;
 import org.apache.hadoop.mapred.lib.db.DBWritable;
+import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.hsqldb.Server;
@@ -99,13 +100,22 @@
     connection.setAutoCommit(false);
   }
 
-  private void shutdown() throws SQLException {
-    connection.commit();
-    connection.close();
-    
-    if(server != null) {
-      server.stop();
-      server.shutdown();
+  private void shutdown() {
+    try {
+      connection.commit();
+      connection.close();
+    }catch (Throwable ex) {
+      LOG.warn("Exception occurred while closing connection :"
+          + StringUtils.stringifyException(ex));
+    } finally {
+      try {
+        if(server != null) {
+          server.shutdown();
+        }
+      }catch (Throwable ex) {
+        LOG.warn("Exception occurred while shutting down HSQLDB :"
+            + StringUtils.stringifyException(ex));
+      }
     }
   }