[jboss-cvs] JBossCache/src/org/jboss/cache/loader ...

[Elias Ross]

  User: genman  
  Date: 07/01/31 17:51:17

  Modified:    src/org/jboss/cache/loader  JDBCCacheLoader.java
  Log:
  JIRA-693 - Fix Locale issues
  
  Revision  Changes    Path
  1.31      +15 -6     JBossCache/src/org/jboss/cache/loader/JDBCCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JDBCCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/JDBCCacheLoader.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- JDBCCacheLoader.java	21 Jan 2007 15:46:42 -0000	1.30
  +++ JDBCCacheLoader.java	31 Jan 2007 22:51:17 -0000	1.31
  @@ -29,6 +29,7 @@
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.List;
  +import java.util.Locale;
   import java.util.Map;
   import java.util.Properties;
   import java.util.Set;
  @@ -74,7 +75,7 @@
    * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
    * @author <a href="mailto:hmesha at novell.com">Hany Mesha </a>
    * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  - * @version <tt>$Revision: 1.30 $</tt>
  + * @version <tt>$Revision: 1.31 $</tt>
    */
   public class JDBCCacheLoader extends AbstractCacheLoader
   {
  @@ -84,9 +85,17 @@
      private ConnectionFactory cf;
      private String driverName;
   
  +   private static String toUpperCase(String s) {
  +      return s.toUpperCase(Locale.ENGLISH);
  +   }
  +
  +   private static String toLowerCase(String s) {
  +      return s.toUpperCase(Locale.ENGLISH);
  +   }   
  +
      public void setConfig(IndividualCacheLoaderConfig base)
      {
  -      if (config instanceof JDBCCacheLoaderConfig)
  +      if (base instanceof JDBCCacheLoaderConfig)
         {
            config = (JDBCCacheLoaderConfig) base;
         }
  @@ -870,7 +879,7 @@
         try
         {
            DatabaseMetaData dmd = con.getMetaData();
  -         return dmd.getDriverName().toUpperCase();
  +         return toUpperCase(dmd.getDriverName());
         }
         catch (SQLException e)
         {
  @@ -911,11 +920,11 @@
               tableName = tableName.substring(quoteLength, tableName.length() - quoteLength);
               if (dmd.storesLowerCaseQuotedIdentifiers())
               {
  -               tableName = tableName.toLowerCase();
  +               tableName = toLowerCase(tableName);
               }
               else if (dmd.storesUpperCaseQuotedIdentifiers())
               {
  -               tableName = tableName.toUpperCase();
  +               tableName = toUpperCase(tableName);
               }
            }
            else
  @@ -926,7 +935,7 @@
               }
               else if (dmd.storesUpperCaseIdentifiers())
               {
  -               tableName = tableName.toUpperCase();
  +               tableName = toUpperCase(tableName);
               }
            }