Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A17EC10F31 for ; Mon, 24 Mar 2014 13:32:33 +0000 (UTC) Received: (qmail 93823 invoked by uid 500); 24 Mar 2014 13:32:33 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 92957 invoked by uid 500); 24 Mar 2014 13:32:29 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 92924 invoked by uid 99); 24 Mar 2014 13:32:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2014 13:32:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Mon, 24 Mar 2014 13:32:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 975F723888FE; Mon, 24 Mar 2014 13:32:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1580845 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java Date: Mon, 24 Mar 2014 13:32:04 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140324133204.975F723888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Mon Mar 24 13:32:04 2014 New Revision: 1580845 URL: http://svn.apache.org/r1580845 Log: DERBY-6503: Ignore LinkageErrors when loading FilePermissionServiceImpl When attempting to load the class on Java 6, an UnsupportedClassVersionError is (correctly) raised, but it is not among the exceptions that are caught and ignored. Add a catch clause for its superclass LinkageError to handle it. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java?rev=1580845&r1=1580844&r2=1580845&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java Mon Mar 24 13:32:04 2014 @@ -473,6 +473,7 @@ public abstract class FileUtil { } catch (ClassNotFoundException ex) { } catch (InstantiationException ex) { } catch (IllegalAccessException ex) { + } catch (LinkageError e) { } // Could not create an instance. This most likely means we are