db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
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 GMT
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 <identifier expected>
; 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.



Mime
View raw message