X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.cci;h=e5f9f4ded3d5036307414861ae5abc602e2e47be;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=54b65f11f77800ff7e0a8f47dee372828035a0bb;hpb=a0b6f53e5c464c6b84fed30a67fcce32da81012d;p=senf.git

diff --git a/senf/Packets/Packet.cci b/senf/Packets/Packet.cci
index 54b65f1..e5f9f4d 100644
--- a/senf/Packets/Packet.cci
+++ b/senf/Packets/Packet.cci
@@ -64,7 +64,9 @@ prefix_ senf::Packet senf::Packet::next(NoThrow_t)
     const
 {
     PacketInterpreterBase::ptr p (ptr()->next());
-    return !p && ptr()->nextPacketRange() ? checkNext() : Packet(p);
+    if (p) return Packet(p);
+    PacketInterpreterBase::optional_range r (ptr()->nextPacketRange());
+    return (r && ! r->empty()) ? getNext() : Packet();
 }
 
 prefix_ senf::Packet senf::Packet::next()
@@ -99,7 +101,7 @@ prefix_ senf::Packet senf::Packet::last()
     const
 {
     Packet p (ptr()->last());
-    return p.next(nothrow) ? checkLast() : p;
+    return p.next(nothrow) ? getLast() : p;
 }
 
 prefix_ senf::Packet senf::Packet::parseNextAs(factory_t factory)