[xstream-scm] [2191] branches/v-1.4.x: Merge possible NPE in ReflectionProvider from HEAD .

[joehni]

Title: [2191] branches/v-1.4.x: Merge possible NPE in ReflectionProvider from HEAD.

Revision

2191

Author

joehni

Date

2013-12-21 11:53:25 -0600 (Sat, 21 Dec 2013)

Log Message

Merge possible NPE in ReflectionProvider from HEAD.

Modified Paths

• branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.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

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.java (2190 => 2191)

--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.java	2013-12-21 17:37:07 UTC (rev 2190)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.java	2013-12-21 17:53:25 UTC (rev 2191)
@@ -20,6 +20,6 @@
     }
 
     public boolean canConvert(Class type) {
-        return canAccess(type);
+        return type != null && canAccess(type);
     }
 }

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

--- branches/v-1.4.x/xstream-distribution/src/content/changes.html	2013-12-21 17:37:07 UTC (rev 2190)
+++ branches/v-1.4.x/xstream-distribution/src/content/changes.html	2013-12-21 17:53:25 UTC (rev 2191)
@@ -28,7 +28,6 @@
 	<a href="" Log</a>.
 	</p>
 
-<!--  
     <h1 id="upcoming">Upcoming</h1>
 
     <p>Not yet released.</p>
@@ -37,7 +36,13 @@
     
     <ul>
     </ul>
--->
+
+    <h2>Minor changes</h2>
+
+    <ul>
+   		<li>XSTR-749: NPE if ReflectionConverter.canConvert(type) is called with null as argument.</li>
+    </ul>
+
     <h1 id="1.4.6">1.4.6</h1>
 
     <p>Released December 12, 2013.</p>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email