[exo-jcr-commits] exo-jcr SVN: r5102 - kernel/branches/2.2.x/patch/2.2.11-GA/KER-178.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2011-10-26 09:43:39 -0400 (Wed, 26 Oct 2011)
New Revision: 5102

Modified:
   kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch
Log:
KER-178: Fix completed

Modified: kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch
===================================================================
--- kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch	2011-10-26 13:24:12 UTC (rev 5101)
+++ kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch	2011-10-26 13:43:39 UTC (rev 5102)
@@ -1,6 +1,6 @@
 Index: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java
 ===================================================================
---- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java	(revision 4792)
+--- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java	(revision 5100)
 +++ exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java	(working copy)
 @@ -23,6 +23,7 @@
  import java.util.Map;
@@ -24,7 +24,7 @@
      * Instantiates a {@link HashSet} object and fills it with the provided element array.
      *
      * @param elements the list of elements to add
-@@ -155,4 +160,34 @@
+@@ -155,4 +160,35 @@
        String suffix = s.substring(s.length() - end.length());
        return suffix.equalsIgnoreCase(end); 
     }
@@ -47,6 +47,7 @@
 +      {
 +         synchronized (TimeZone.class)
 +         {
++            tz = TIME_ZONES.get(ID);
 +            if (tz == null)
 +            {
 +               tz = TimeZone.getTimeZone(ID);
@@ -61,14 +62,14 @@
  }
 Index: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java
 ===================================================================
---- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java	(revision 4792)
+--- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java	(revision 5100)
 +++ exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java	(working copy)
 @@ -187,7 +187,7 @@
-          return null;
-       }
- 
--      TimeZone tz = TimeZone.getTimeZone(tzID);
-+      TimeZone tz = Tools.getTimeZone(tzID);
-       // verify id of returned time zone (getTimeZone defaults to "GMT")
-       if (!tz.getID().equals(tzID))
-       {
+          return null;
+       }
+ 
+-      TimeZone tz = TimeZone.getTimeZone(tzID);
++      TimeZone tz = Tools.getTimeZone(tzID);
+       // verify id of returned time zone (getTimeZone defaults to "GMT")
+       if (!tz.getID().equals(tzID))
+       {