raphael 2002/11/08 01:47:25
Modified: src/java/org/apache/jetspeed/capability
CapabilityMapFactory.java
Log:
Make sure factory never returns a null map, even with unknown browser
Revision Changes Path
1.11 +10 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/capability/CapabilityMapFactory.java
Index: CapabilityMapFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/capability/CapabilityMapFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CapabilityMapFactory.java 7 Nov 2002 20:17:41 -0000 1.10
+++ CapabilityMapFactory.java 8 Nov 2002 09:47:25 -0000 1.11
@@ -119,6 +119,15 @@
ClientEntry entry = registry.findEntry(useragent);
map = new BaseCapabilityMap(useragent, entry);
+ if ( (map == null) && (!useragent.equals(DEFAULT_AGENT)) )
+ {
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("CapabilityMap: useragent "+ useragent + "unknown,
falling back to default");
+ }
+ map = getDefaultCapabilityMap();
+ }
+
if (Log.getLogger().isDebugEnabled())
{
Log.debug("CapabilityMap: User-agent: "+useragent+" mapped to "+map);
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@;jakarta.apache.org>
