svn commit: r607688 - /jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java

Author: bayard
Date: Sun Dec 30 22:54:20 2007
New Revision: 607688

URL: http://svn.apache.org/viewvc?rev=607688&view=rev
Log:
Fixing a null pointer bug that was shown by turning the old static function tests into an executed junit test

Modified:
    jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java

Modified: jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java?rev=607688&r1=607687&r2=607688&view=diff
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java (original)
+++ jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java Sun Dec 30 22:54:20 2007
@@ -378,16 +378,18 @@
         return;
       }
 
-      String value = pageContext.getServletContext().
-                     getInitParameter(EXPR_CACHE_PARAM);
-      if (value != null) {
-        sCachedExpressionStrings = 
-          Collections.synchronizedMap(new LRUMap(Integer.parseInt(value)));
-      }
-      else {
-        sCachedExpressionStrings = 
-          Collections.synchronizedMap(new LRUMap(MAX_SIZE));
+      if( (pageContext != null) && (pageContext.getServletContext() != null) ) {
+
+          String value = pageContext.getServletContext().getInitParameter(EXPR_CACHE_PARAM);
+          if (value != null) {
+            sCachedExpressionStrings = Collections.synchronizedMap(new LRUMap(Integer.parseInt(value)));
+            return;
+          }
+
       }
+
+      // fall through if it couldn't find the parameter
+      sCachedExpressionStrings = Collections.synchronizedMap(new LRUMap(MAX_SIZE));
   }
 
   //-------------------------------------