#6154 Exception when opening CalendarPanel for a PopupDateField with resolution year

svn changeset:16500/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index ee754a08f70ec595db01cd02eee7b743de6e1eef..86653724f340749013f4c1c796d9cdd7e8358367 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
@@ -1675,7 +1675,9 @@ public class VCalendarPanel extends FocusableFlexTable implements
             hasFocus = true;\r
 \r
             // Focuses the current day if the calendar shows the days\r
-            focusDay(focusedDay.getDay());\r
+            if (focusedDay != null) {\r
+                focusDay(focusedDay.getDay());\r
+            }\r
         }\r
     }\r
 \r