Author: awiner
Date: Thu Mar 26 19:37:28 2009
New Revision: 758813
URL: http://svn.apache.org/viewvc?rev=758813&view=rev
Log:
Thank you Kevin, for paying attention: fix NPE (re-)introduced by previous
checkin
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=758813&r1=758812&r2=758813&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
Thu Mar 26 19:37:28 2009
@@ -116,8 +116,10 @@
}
}
+ @SuppressWarnings("unchecked")
+ // Class.cast() would be better - but the Class object may be null
public <T> T convertToObject(String string, Class<T> clazz) {
- return clazz.cast(convertToObject(string, (Type) clazz));
+ return (T)convertToObject(string, (Type) clazz);
}
@SuppressWarnings("unchecked")
