geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r776347 - /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java
Date Tue, 19 May 2009 14:53:26 GMT
Author: gnodet
Date: Tue May 19 14:53:26 2009
New Revision: 776347

URL: http://svn.apache.org/viewvc?rev=776347&view=rev
Log:
Allow returning null after Convertible#convert()

Modified:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java?rev=776347&r1=776346&r2=776347&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java
Tue May 19 14:53:26 2009
@@ -47,10 +47,7 @@
     public static Object convert(Object obj, Type type, ConversionService converter) throws
Exception {
         // First convert service proxies
         if (obj instanceof Convertible) {
-            Object o = ((Convertible) obj).convert(type);
-            if (o != null) {
-                return o;
-            }
+            return ((Convertible) obj).convert(type);
         }
         // Handle arrays, collections and generics
         if (obj == null) {



Mime
View raw message