Author: henning
Date: Fri Sep 9 07:04:11 2005
New Revision: 279778
URL: http://svn.apache.org/viewcvs?rev=279778&view=rev
Log:
Remove NPE in convertAndTrim
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParserUtils.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParserUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParserUtils.java?rev=279778&r1=279777&r2=279778&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParserUtils.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParserUtils.java
Fri Sep 9 07:04:11 2005
@@ -88,28 +88,33 @@
*/
public static String convertAndTrim(String value, int fold)
{
- String tmp = value.trim();
+ String tmp = null;
- switch (fold)
+ if (value != null)
{
- case URL_CASE_FOLDING_NONE:
- {
- break;
- }
- case URL_CASE_FOLDING_LOWER:
- {
- tmp = tmp.toLowerCase();
- break;
- }
- case URL_CASE_FOLDING_UPPER:
- {
- tmp = tmp.toUpperCase();
- break;
- }
- default:
+ tmp = value.trim();
+
+ switch (fold)
{
- log.error("Passed " + fold + " as fold rule, which is
illegal!");
- break;
+ case URL_CASE_FOLDING_NONE:
+ {
+ break;
+ }
+ case URL_CASE_FOLDING_LOWER:
+ {
+ tmp = tmp.toLowerCase();
+ break;
+ }
+ case URL_CASE_FOLDING_UPPER:
+ {
+ tmp = tmp.toUpperCase();
+ break;
+ }
+ default:
+ {
+ log.error("Passed " + fold + " as fold rule, which is
illegal!");
+ break;
+ }
}
}
return tmp;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
