You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2009/10/15 00:14:48 UTC
svn commit: r825310 - in /myfaces/trinidad/branches/1.2.12.2-branch:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
Author: jwaldman
Date: Wed Oct 14 22:14:48 2009
New Revision: 825310
URL: http://svn.apache.org/viewvc?rev=825310&view=rev
Log:
TRINIDAD-1520 NPE from Google Bot (unknown agent)
backport to 1.2.12.2-branch for Pavitra Subramaniam
Modified:
myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentImpl.java
Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?rev=825310&r1=825309&r2=825310&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Wed Oct 14 22:14:48 2009
@@ -62,6 +62,11 @@
public static final Object TYPE_PHONE = "phone";
/**
+ * Constant for unknown platform
+ */
+ public static final String PLATFORM_UNKNOWN = "unknown";
+
+ /**
* Constant for windows platform
*/
public static final String PLATFORM_WINDOWS = "windows";
@@ -120,6 +125,11 @@
public static final String PLATFORM_GENERICPDA = "genericpda";
/**
+ * Constant for unknown platform version
+ */
+ public static final String PLATFORM_VERSION_UNKNOWN = "unknown";
+
+ /**
* Constant for when the agent is not supported or not recognized
*/
public static final String AGENT_UNKNOWN = "unknown";
@@ -175,6 +185,16 @@
public static final String AGENT_GENERICPDA = "genericpda";
/**
+ * Constant for unknown Agent version
+ */
+ public static final String AGENT_VERSION_UNKNOWN = "unknown";
+
+ /**
+ * Constant for unknown make model version
+ */
+ public static final String MAKE_MODEL_UNKNOWN = "unknown";
+
+ /**
*
* @return return the Type of Agent. Returns <code>TYPE_UNKNOWN</code> if not available.
* <br>E.g. desktop, pda, phone
Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=825310&r1=825309&r2=825310&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Wed Oct 14 22:14:48 2009
@@ -104,12 +104,6 @@
return;
}
- if (userAgent == null)
- {
- _populateUnknownAgentImpl(null, agent);
- 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
@@ -264,12 +258,6 @@
// 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.setAgent(Agent.AGENT_UNKNOWN);
- agent.setType(_UNKNOWN);
- agent.setAgentVersion(_UNKNOWN);
- agent.setPlatform(_UNKNOWN);
- agent.setPlatformVersion(_UNKNOWN);
- agent.setMakeModel(_UNKNOWN);
}
//populates the agent entry for DT access for either Telnet or PDA
@@ -865,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
@@ -912,9 +900,9 @@
agentObj.setAgent(Agent.AGENT_EMAIL);
agentObj.setAgentVersion("0.0");
- agentObj.setPlatform(_UNKNOWN);
- agentObj.setPlatformVersion(_UNKNOWN);
- agentObj.setMakeModel(_UNKNOWN);
+ agentObj.setPlatform(Agent.AGENT_UNKNOWN);
+ agentObj.setPlatformVersion(Agent.PLATFORM_VERSION_UNKNOWN);
+ agentObj.setMakeModel(Agent.MAKE_MODEL_UNKNOWN);
}
@@ -978,7 +966,6 @@
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 _UNKNOWN = "unknown";
static final private TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(AgentFactoryImpl.class);
}
Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentImpl.java?rev=825310&r1=825309&r2=825310&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentImpl.java (original)
+++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentImpl.java Wed Oct 14 22:14:48 2009
@@ -146,11 +146,11 @@
private static class AgentEntry
{
Object _type = TYPE_UNKNOWN;
- String _agent;
- String _agentVersion;
- String _platform;
- String _platformVersion;
- String _makeModel;
+ String _agent = AGENT_UNKNOWN;
+ String _agentVersion = AGENT_VERSION_UNKNOWN;
+ String _platform = PLATFORM_UNKNOWN;
+ String _platformVersion = PLATFORM_VERSION_UNKNOWN;
+ String _makeModel = MAKE_MODEL_UNKNOWN;
}
void __addRequestCapability(CapabilityKey key,Object value)