You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2013/06/17 14:13:33 UTC
svn commit: r1493723 -
/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
Author: snoopdave
Date: Mon Jun 17 12:13:32 2013
New Revision: 1493723
URL: http://svn.apache.org/r1493723
Log:
prevent NPE when no user-agent in request
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java?rev=1493723&r1=1493722&r2=1493723&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java Mon Jun 17 12:13:32 2013
@@ -58,11 +58,13 @@ public class MobileDeviceRepository {
* @return boolean
*/
public static boolean isMobileDevice(HttpServletRequest request) {
-
- String userAgent = request.getHeader("User-Agent").toLowerCase();
- return (userAgent.matches(possibleDevices1) || userAgent.substring(0, 4).matches(possibleDevices2));
-
- }
+ String userAgent = request.getHeader("User-Agent");
+ if (userAgent != null) {
+ userAgent = request.getHeader("User-Agent").toLowerCase();
+ return (userAgent.matches(possibleDevices1) || userAgent.substring(0, 4).matches(possibleDevices2));
+ }
+ return false;
+ }
public static DeviceType getRequestType(HttpServletRequest request) {
DeviceType type = DeviceType.standard;