From 80f356e85409126e8073e3a7e96087791f00a37c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 14 Dec 2010 12:45:41 +0000
Subject: [PATCH] #6154 Exception when opening CalendarPanel for a
 PopupDateField with resolution year

svn changeset:16500/svn branch:6.5
---
 src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index ee754a08f7..86653724f3 100644
--- 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;
 
             // Focuses the current day if the calendar shows the days
-            focusDay(focusedDay.getDay());
+            if (focusedDay != null) {
+                focusDay(focusedDay.getDay());
+            }
         }
     }
 
-- 
2.39.5