You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2009/10/06 21:28:09 UTC
svn commit: r822450 -
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
Author: ckormos
Date: Tue Oct 6 19:28:08 2009
New Revision: 822450
URL: http://svn.apache.org/viewvc?rev=822450&view=rev
Log:
[TRINIDAD-1520] - NPE from Google Bot (unknown agent) - fixed failing test cases
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=822450&r1=822449&r2=822450&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Tue Oct 6 19:28:08 2009
@@ -104,8 +104,6 @@
return;
}
-
-
//the useragent string for telnet and PDA design time will start with
//OracleJDevMobile because in each of these cases we know we have an
//exact match in the device repository for the agent name. This is
@@ -259,7 +257,7 @@
{
// Log warning message that we are setting the agent entry to unknown attributes
_LOG.warning("UNKNOWN_AGENT_ATTRIBUTES_CREATE_WITH_UNKNOWN", userAgent);
- agent.setAgentEntryToNULL();
+ agent.setAgentEntryToNULL();
}
//populates the agent entry for DT access for either Telnet or PDA
@@ -855,7 +853,7 @@
}
// try to determine the OS, if unknown
- if (agentObj.getPlatformName() == null)
+ if (agentObj.getPlatformName() == null || agentObj.getPlatformName().equals(Agent.PLATFORM_UNKNOWN))
{
// Hack: treat the JDeveloper agent as Windows,
// so that we assume IE 6.0 Windows capabilities
@@ -967,7 +965,7 @@
}
static private final String _EMAIL_PARAM =
"org.apache.myfaces.trinidad.agent.email";
- static final private String _IASW_DEVICE_HINT_PARAM = "X-Oracle-Device.Class";
+ static final private String _IASW_DEVICE_HINT_PARAM = "X-Oracle-Device.Class";
static final private TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(AgentFactoryImpl.class);
}