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 7600C1044A for ; Fri, 30 Aug 2013 16:03:23 +0000 (UTC) Received: (qmail 44099 invoked by uid 500); 30 Aug 2013 16:03:23 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 44079 invoked by uid 500); 30 Aug 2013 16:03:23 -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 44072 invoked by uid 99); 30 Aug 2013 16:03:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Aug 2013 16:03:23 +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; Fri, 30 Aug 2013 16:03:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C408423888E7; Fri, 30 Aug 2013 16:02:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519007 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java Date: Fri, 30 Aug 2013 16:02:59 -0000 To: derby-commits@db.apache.org From: dag@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130830160259.C408423888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dag Date: Fri Aug 30 16:02:59 2013 New Revision: 1519007 URL: http://svn.apache.org/r1519007 Log: DERBY-6322: Remove erreoneous warning in NetBeans: superfluous use of super to access inherited member variable This code in SortBufferScan makes NetBeans (7.4beta) issue a warning: return (super.current != null); "Incompatible types: boolean is not a functional interface ; expected" Patch derby-6322 removes the redundant "super." prefix. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java?rev=1519007&r1=1519006&r2=1519007&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java Fri Aug 30 16:02:59 2013 @@ -67,7 +67,7 @@ public class SortBufferScan extends Sort **/ public boolean next() throws StandardException - { + { if (SanityManager.DEBUG) { SanityManager.ASSERT( @@ -75,9 +75,9 @@ public class SortBufferScan extends Sort "next() called on scan after scan was closed."); } - super.current = sortBuffer.removeFirst(); - return (super.current != null); - } + current = sortBuffer.removeFirst(); + return current != null; + } /** Close the scan.