[Japi-cvs] SF.net SVN: japi:[1349] libs/util/trunk/src/prj/net/sf/japi/util/ LocaleComparator.java

[<chr...@us...>]

Revision: 1349
          http://japi.svn.sourceforge.net/japi/?rev=1349&view=rev
Author:   christianhujer
Date:     2009-06-14 09:30:23 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Improve deserialization.

Modified Paths:
--------------
    libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java

Modified: libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java	2009-06-14 09:29:54 UTC (rev 1348)
+++ libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java	2009-06-14 09:30:23 UTC (rev 1349)
@@ -18,6 +18,8 @@
 
 package net.sf.japi.util;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.text.Collator;
 import java.util.Comparator;
@@ -36,15 +38,21 @@
     private static final long serialVersionUID = 1L;
 
     /** Collator for comparing the names.
-     * @serial include
+     * @serial exclude
      */
-    @NotNull private final Collator collator = Collator.getInstance();
+    @NotNull private transient Collator collator = Collator.getInstance();
 
     /** Create a LocaleComparator. */
     public LocaleComparator() {
     }
 
     /** {@inheritDoc} */
+    private void readObject(@NotNull final ObjectInputStream in) throws ClassNotFoundException, IOException {
+        in.defaultReadObject();
+        collator = Collator.getInstance();
+    }
+
+    /** {@inheritDoc} */
     public int compare(@Nullable final Locale o1, @Nullable final Locale o2) {
         if (o1 == null && o2 == null) {
             return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.