Author: simonetripodi
Date: Tue Jul 12 07:34:20 2011
New Revision: 1145477
URL: http://svn.apache.org/viewvc?rev=1145477&view=rev
Log:
according to java.util.Queue javadoc, element() Throws exceptions when peek()
returns special values
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java?rev=1145477&r1=1145476&r2=1145477&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java
Tue Jul 12 07:34:20 2011
@@ -226,9 +226,9 @@ public final class FibonacciHeap<E>
{
if ( isEmpty() )
{
- return null;
+ throw new NoSuchElementException();
}
- return minimumNode.getElement();
+ return peek();
}
/**
@@ -244,7 +244,12 @@ public final class FibonacciHeap<E>
*/
public E peek()
{
- return element();
+ if ( isEmpty() )
+ {
+ return null;
+ }
+
+ return minimumNode.getElement();
}
/**
