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

[michi at wyona.com]

Author: michi
Date: 2011-06-30 10:46:02 +0200 (Thu, 30 Jun 2011)
New Revision: 59043

Modified:
   public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java
Log:
check if user agent is null

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-06-30 07:45:00 UTC (rev 59042)
+++ public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java	2011-06-30 08:46:02 UTC (rev 59043)
@@ -369,16 +369,22 @@
 
     /**
      * Get operating system
+     * @param userAgent User agent
      */
     public String getOS(String userAgent) {
-        if (userAgent.indexOf("Linux") > 0) {
-            return "unix";
-        } else if (userAgent.indexOf("Mac OS X") > 0) {
-            return "unix";
-        } else if (userAgent.indexOf("Windows") > 0) {
-            return "windows";
+        if (userAgent != null) {
+            if (userAgent.indexOf("Linux") > 0) {
+                return "unix";
+            } else if (userAgent.indexOf("Mac OS X") > 0) {
+                return "unix";
+            } else if (userAgent.indexOf("Windows") > 0) {
+                return "windows";
+            } else {
+                log.warn("Operating System could not be recognized: " + userAgent);
+                return null;
+            }
         } else {
-            log.warn("Operating System could not be recognized: " + userAgent);
+            log.warn("No user agent specified");
             return null;
         }
     }