[xstream-scm] [2356] branches/v-1.4.x: Merge UUID as immutable type from trunk.

[joehni]

Title: [2356] branches/v-1.4.x: Merge UUID as immutable type from trunk.

Revision

2356

Author

joehni

Date

2015-02-20 09:33:04 -0600 (Fri, 20 Feb 2015)

Log Message

Merge UUID as immutable type from trunk.

Modified Paths

• branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java
• branches/v-1.4.x/xstream-distribution/src/content/changes.html

Property Changed

branches/v-1.4.x/

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214-2217,2226,2229,2231,2233-2234,2236-2238,2247-2249,2279-2280,2285,2291-2292,2294,2298-2299,2301,2303,2306-2310,2312,2314,2316-2318,2320,2322,2324,2326,2329,2333,2335,2339,2341,2353,2355

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java (2355 => 2356)

--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java	2015-02-20 15:28:38 UTC (rev 2355)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java	2015-02-20 15:33:04 UTC (rev 2356)
@@ -969,6 +969,10 @@
             addImmutableTypeDynamically("java.nio.charset.Charset");
             addImmutableTypeDynamically("java.util.Currency");
         }
+        
+        if (JVM.is15()) {
+            addImmutableTypeDynamically("java.util.UUID");
+        }
     }
 
     private void addImmutableTypeDynamically(String className) {

Modified: branches/v-1.4.x/xstream-distribution/src/content/changes.html (2355 => 2356)

--- branches/v-1.4.x/xstream-distribution/src/content/changes.html	2015-02-20 15:28:38 UTC (rev 2355)
+++ branches/v-1.4.x/xstream-distribution/src/content/changes.html	2015-02-20 15:33:04 UTC (rev 2356)
@@ -27,11 +27,17 @@
 	<a href="" and
 	<a href="" Log</a>.
 	</p>
-<!--
+
     <h1 id="upcoming-1.4.x">Upcoming 1.4.x maintenance release</h1>
 
     <p>Not yet released.</p>
--->
+
+    <h2>Minor changes</h2>
+
+    <ul>
+    	<li>UUID is an immutable type by default.</li>
+    </ul>
+
     <h1 id="1.4.8">1.4.8</h1>
 
     <p>Released February 18, 2015.</p>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email