Author: mbenson
Date: Tue Sep 28 21:52:32 2010
New Revision: 1002368
URL: http://svn.apache.org/viewvc?rev=1002368&view=rev
Log:
Make ObjectUtils.defaultIfNull generic
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java?rev=1002368&r1=1002367&r2=1002368&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
Tue Sep 28 21:52:32 2010
@@ -92,7 +92,7 @@ public class ObjectUtils {
* @param defaultValue the default value to return, may be
<code>null</code>
* @return <code>object</code> if it is not <code>null</code>,
defaultValue otherwise
*/
- public static Object defaultIfNull(Object object, Object defaultValue) {
+ public static <T> T defaultIfNull(T object, T defaultValue) {
return object != null ? object : defaultValue;
}