Index: org/postgresql/jdbc2/EscapedFunctions.java
===================================================================
RCS file: /cvsroot/jdbc/pgjdbc/org/postgresql/jdbc2/EscapedFunctions.java,v
retrieving revision 1.12
diff -c -r1.12 EscapedFunctions.java
*** org/postgresql/jdbc2/EscapedFunctions.java	16 Nov 2008 12:14:06 -0000	1.12
--- org/postgresql/jdbc2/EscapedFunctions.java	1 May 2010 15:40:10 -0000
***************
*** 116,138 ****
      
      
      /** storage for functions implementations */
!     private static Map functionMap = null;
!     
      /**
       * get Method object implementing the given function
       * @param functionName name of the searched function
       * @return a Method object or null if not found
       */
      public static Method getFunction(String functionName){
-         if (functionMap==null){
-             Method[] arrayMeths = EscapedFunctions.class.getDeclaredMethods();
-             functionMap = new HashMap(arrayMeths.length*2);
-             for (int i=0;i<arrayMeths.length;i++){
-                 Method meth = arrayMeths[i];
-                 if (meth.getName().startsWith("sql"))
-                     functionMap.put(meth.getName().toLowerCase(Locale.US),meth);
-             }
-         }
          return (Method) functionMap.get("sql"+functionName.toLowerCase(Locale.US));
      }
  
--- 116,143 ----
      
      
      /** storage for functions implementations */
!     private static Map functionMap;
! 
!     static {
!     	initializeFunctionMap();
!     }
! 
!     private static void initializeFunctionMap() {
!     	Method[] arrayMeths = EscapedFunctions.class.getDeclaredMethods();
!         functionMap = new HashMap(arrayMeths.length*2);
!         for (int i=0;i<arrayMeths.length;i++){
!             Method meth = arrayMeths[i];
!             if (meth.getName().startsWith("sql"))
!                 functionMap.put(meth.getName().toLowerCase(Locale.US),meth);
!         }
!     }
! 
      /**
       * get Method object implementing the given function
       * @param functionName name of the searched function
       * @return a Method object or null if not found
       */
      public static Method getFunction(String functionName){
          return (Method) functionMap.get("sql"+functionName.toLowerCase(Locale.US));
      }