Fixed two NPE situations.

svn changeset:3679/svn branch:trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java b/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java
index e452c0162b..7e57a138ce 100644
--- a/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java
+++ b/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java
@@ -264,6 +264,9 @@ public class ContainerOrderedWrapper implements Container.Ordered,
         if (ordered) {
             return ((Container.Ordered) container).nextItemId(itemId);
         }
+        if (itemId == null) {
+            return null;
+        }
         return next.get(itemId);
     }
 
@@ -276,6 +279,9 @@ public class ContainerOrderedWrapper implements Container.Ordered,
         if (ordered) {
             return ((Container.Ordered) container).prevItemId(itemId);
         }
+        if (itemId == null) {
+            return null;
+        }
         return prev.get(itemId);
     }