You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@shindig.apache.org by jo...@apache.org on 2010/04/23 06:34:39 UTC

svn commit: r937150 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java

Author: johnh
Date: Fri Apr 23 04:34:39 2010
New Revision: 937150

URL: http://svn.apache.org/viewvc?rev=937150&view=rev
Log:
Browser-specific resource matchers tolerant to no-match.


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java?rev=937150&r1=937149&r2=937150&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java Fri Apr 23 04:34:39 2010
@@ -103,8 +103,10 @@ public class BrowserSpecificFeatureResou
     }
     UserAgent ua = uaProvider.get();
     List<VersionMatcher> versionMatchers = browserMatch.get(ua.getBrowser());
-    for (VersionMatcher matcher : versionMatchers) {
-      if (matcher.matches(ua.getVersion())) return true;
+    if (versionMatchers != null) {
+      for (VersionMatcher matcher : versionMatchers) {
+        if (matcher.matches(ua.getVersion())) return true;
+      }
     }
     return false;
   }