You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/07/22 00:52:44 UTC
svn commit: r796572 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
Author: rickhall
Date: Tue Jul 21 22:52:44 2009
New Revision: 796572
URL: http://svn.apache.org/viewvc?rev=796572&view=rev
Log:
Check for null execution environment. (FELIX-1397)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java?rev=796572&r1=796571&r2=796572&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java Tue Jul 21 22:52:44 2009
@@ -58,7 +58,7 @@
public Resolver(Logger logger, String fwkExecEnvStr)
{
m_logger = logger;
- m_fwkExecEnvStr = fwkExecEnvStr.trim();
+ m_fwkExecEnvStr = (fwkExecEnvStr != null) ? fwkExecEnvStr.trim() : null;
m_fwkExecEnvSet = parseExecutionEnvironments(fwkExecEnvStr);
}
@@ -1632,14 +1632,16 @@
* system variable 'org.osgi.framework.executionenvironment'.
* @param frameworkEnvironment Comma delimited string of provided execution environments
**/
- private static Set parseExecutionEnvironments(String frameworkEnvironment)
+ private static Set parseExecutionEnvironments(String fwkExecEnvStr)
{
- StringTokenizer tokens = new StringTokenizer(frameworkEnvironment, ",");
-
- Set newSet = new HashSet(tokens.countTokens());
- while (tokens.hasMoreTokens())
+ Set newSet = new HashSet();
+ if (fwkExecEnvStr != null)
{
- newSet.add(tokens.nextToken().trim());
+ StringTokenizer tokens = new StringTokenizer(fwkExecEnvStr, ",");
+ while (tokens.hasMoreTokens())
+ {
+ newSet.add(tokens.nextToken().trim());
+ }
}
return newSet;
}