Author: davidb
Date: Thu Dec 20 16:27:27 2018
New Revision: 1849415

URL: http://svn.apache.org/viewvc?rev=1849415&view=rev
Log:
FELIX-6006 errorHandler not consulted for conversions implemented via proxies

Minor fix to the implementation

Modified:
    
felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/CustomConverterImpl.java

Modified: 
felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/CustomConverterImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/CustomConverterImpl.java?rev=1849415&r1=1849414&r2=1849415&view=diff
==============================================================================
--- 
felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/CustomConverterImpl.java
 (original)
+++ 
felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/CustomConverterImpl.java
 Thu Dec 20 16:27:27 2018
@@ -228,7 +228,7 @@ class CustomConverterImpl implements Int
                     } catch (Exception ex) {
                         for (ConverterFunction eh : errorHandlers) {
                             try {
-                                Object handled = eh.apply(object, type);
+                                Object handled = eh.apply(wrapped, type);
                                 if (handled != ConverterFunction.CANNOT_HANDLE)
                                     return handled;
                             } catch (RuntimeException re) {


Reply via email to