From 81478c69903dbcd299e2748a3a37857647f8fa70 Mon Sep 17 00:00:00 2001
From: sin <sin@localhost>
Date: Thu, 26 Mar 2009 03:24:33 +0000
Subject: [PATCH] Fix for issue#3880:Core matching rules don't support unicode characters

---
 opends/src/server/org/opends/server/util/Platform.java |   65 +++++++++-----------------------
 1 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/opends/src/server/org/opends/server/util/Platform.java b/opends/src/server/org/opends/server/util/Platform.java
index d5ce295..4e8f21a 100644
--- a/opends/src/server/org/opends/server/util/Platform.java
+++ b/opends/src/server/org/opends/server/util/Platform.java
@@ -543,49 +543,38 @@
     /**
      * Sun 5 JDK platform class.
      */
-    private static class Sun5PlatformIMPL extends PlatformIMPL
-   {
+    private static class Sun5PlatformIMPL extends PlatformIMPL {
        //normalize method.
       private static final Method NORMALIZE;
       //Normalized form method.
       private static final Object FORM_NFKC;
 
-      static
-      {
+      static {
         Method normalize = null;
         Object formNFKC = null;
-        try
-        {
+        try {
           Class<?> normalizer = Class.forName("sun.text.Normalizer");
           formNFKC = normalizer.getField("DECOMP_COMPAT").get(null);
           Class<?> normalizerForm = Class.forName("sun.text.Normalizer$Mode");
           normalize = normalizer.getMethod("normalize", String.class,
                  normalizerForm, Integer.TYPE);
         }
-        catch (Exception ex)
-        {
+        catch (Exception ex) {
         // Do not use Normalizer. The values are already set to null.
         }
       NORMALIZE = normalize;
       FORM_NFKC = formNFKC;
      }
 
-     private Sun5PlatformIMPL()
-     {
-       super();
-     }
 
       @Override
-      public void normalize(StringBuilder buffer)
-      {
-        try
-        {
+      public void normalize(StringBuilder buffer) {
+        try {
           String normal =
                (String) NORMALIZE.invoke(null, buffer.toString(), FORM_NFKC,0);
           buffer.replace(0,buffer.length(),normal);
         }
-        catch(Exception ex)
-        {
+        catch(Exception ex) {
           //Don't do anything. buffer should be used.
         }
       }
@@ -594,48 +583,38 @@
     /**
      * Default platform class.
      */
-     private static class DefaultPlatformIMPL extends PlatformIMPL
-   {
+     private static class DefaultPlatformIMPL extends PlatformIMPL {
        //normalize method.
       private static final Method NORMALIZE;
       //Normalized form method.
       private static final Object FORM_NFKC;
 
-      static
-      {
+      static {
+
         Method normalize = null;
         Object formNFKC = null;
-        try
-        {
+        try {
           Class<?> normalizer = Class.forName("java.text.Normalizer");
           Class<?> normalizerForm = Class.forName("java.text.Normalizer$Form");
           normalize = normalizer.getMethod("normalize", CharSequence.class,
                 normalizerForm);
           formNFKC = normalizerForm.getField("NFKD").get(null);
         }
-        catch (Exception ex)
-        {
+        catch (Exception ex) {
         // Do not use Normalizer. The values are already set to null.
         }
         NORMALIZE = normalize;
         FORM_NFKC = formNFKC;
      }
 
-     private DefaultPlatformIMPL()
-     {
-       super();
-     }
 
       @Override
-      public void normalize(StringBuilder buffer)
-      {
-        try
-        {
+      public void normalize(StringBuilder buffer) {
+        try {
           String normal = (String) NORMALIZE.invoke(null, buffer, FORM_NFKC);
           buffer.replace(0,buffer.length(),normal);
         }
-        catch(Exception ex)
-        {
+        catch(Exception ex) {
           //Don't do anything. buffer should be used.
         }
       }
@@ -644,15 +623,10 @@
    /**
     * IBM JDK 5 platform class.
     */
-   private static class IBM5PlatformIMPL extends PlatformIMPL
-   {
-   private IBM5PlatformIMPL()
-     {
-       super();
-     }
+   private static class IBM5PlatformIMPL extends PlatformIMPL {
+
     @Override
-    public void normalize(StringBuilder buffer)
-    {
+    public void normalize(StringBuilder buffer) {
       //No implementation.
     }
    }
@@ -662,8 +636,7 @@
     *
     * @param buffer The buffer to normalize.
     */
-   public static void normalize(StringBuilder buffer)
-   {
+   public static void normalize(StringBuilder buffer) {
      IMPL.normalize(buffer);
    }
 

--
Gitblit v1.10.0