From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 23 May 2008 11:31:18 +0000 (+0000)
Subject: np check for browser and browsers string (needed for portlet integration)
X-Git-Tag: 6.7.0.beta1~4708
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df7c91b28a8743ecabab030e3dfec5cbc45fc31b;p=vaadin-framework.git

np check for browser and browsers string (needed for portlet integration)

svn changeset:4624/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 6edf362d0a..27972119ba 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -925,9 +925,11 @@ public class ApplicationServlet extends HttpServlet {
     private boolean isGecko17(HttpServletRequest request) {
         final WebBrowser browser = WebApplicationContext.getApplicationContext(
                 request.getSession()).getBrowser();
-        if (browser.getBrowserApplication().indexOf("rv:1.7.") > 0
-                && browser.getBrowserApplication().indexOf("Gecko") > 0) {
-            return true;
+        if (browser != null && browser.getBrowserApplication() != null) {
+            if (browser.getBrowserApplication().indexOf("rv:1.7.") > 0
+                    && browser.getBrowserApplication().indexOf("Gecko") > 0) {
+                return true;
+            }
         }
         return false;
     }