[Yanel-commits] rev 59130 - public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation

[michi at wyona.com]

Author: michi
Date: 2011-07-02 10:25:53 +0200 (Sat, 02 Jul 2011)
New Revision: 59130

Modified:
   public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java
Log:
catch possible null pointer

Modified: public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java
===================================================================
--- public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java	2011-07-02 08:02:51 UTC (rev 59129)
+++ public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java	2011-07-02 08:25:53 UTC (rev 59130)
@@ -391,18 +391,24 @@
 
     /**
      * Get client
+     * @param userAgent User agent
      */
     public String getClient(String userAgent) {
-        if (userAgent.indexOf("Firefox") > 0) {
-            return "firefox";
-        } else if (userAgent.indexOf("MSIE") > 0) {
-            return "msie";
-        } else if (userAgent.indexOf("Chrome") > 0) { // INFO: Please note that the chrome user agent also contains the word Safari, e.g. "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Safari/534.24"
-            return "chrome";
-        } else if (userAgent.indexOf("Safari") > 0) {
-            return "safari";
+        if (userAgent != null) {
+            if (userAgent.indexOf("Firefox") > 0) {
+                return "firefox";
+            } else if (userAgent.indexOf("MSIE") > 0) {
+                return "msie";
+            } else if (userAgent.indexOf("Chrome") > 0) { // INFO: Please note that the chrome user agent also contains the word Safari, e.g. "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Safari/534.24"
+                return "chrome";
+            } else if (userAgent.indexOf("Safari") > 0) {
+                return "safari";
+            } else {
+                log.warn("Client could not be recognized: " + userAgent);
+                return null;
+            }
         } else {
-            log.warn("Client could not be recognized: " + userAgent);
+            log.warn("No user agent specified");
             return null;
         }
     }