WW-4427 adds complete fix

Author: lukaszlenart

xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java

@@ -312,9 +312,11 @@ public Object findValue(String expr, Class asType, boolean throwExceptionOnFailu
             setupExceptionOnFailure(throwExceptionOnFailure);
             return tryFindValueWhenExpressionIsNotNull(expr, asType);
         } catch (OgnlException e) {
-            return handleOgnlException(expr, throwExceptionOnFailure, e);
+            final Object value = handleOgnlException(expr, throwExceptionOnFailure, e);
+            return converter.convertValue(getContext(), value, asType);
         } catch (Exception e) {
-            return handleOtherException(expr, throwExceptionOnFailure, e);
+            final Object value = handleOtherException(expr, throwExceptionOnFailure, e);
+            return converter.convertValue(getContext(), value, asType);
         } finally {
             ReflectionContextState.clear(context);
         }

xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java

@@ -94,19 +94,25 @@ public void testArrayAsString() {
     }
 
     public void testValuesFromContextAreConverted() {
-        final OgnlValueStack vs = createValueStack();
+        testValuesFromContextAreConverted("dogName");
+        testValuesFromContextAreConverted("dog.name");
+    }
 
-        final String propertyName = "dogName";
+    private void testValuesFromContextAreConverted(String propertyName) {
+        final OgnlValueStack vs = createValueStack();
         final String propertyValue = "Rover";
         vs.getContext().put(propertyName, new String[]{propertyValue});
 
         assertEquals(propertyValue, vs.findValue(propertyName, String.class));
     }
 
     public void testNullValueFromContextGetsConverted() {
-        final OgnlValueStack vs = createValueStack();
+        testNullValueFromContextGetsConverted("dogName");
+        testNullValueFromContextGetsConverted("dog.name");
+    }
 
-        final String propertyName = "dogName";
+    private void testNullValueFromContextGetsConverted(String propertyName) {
+        final OgnlValueStack vs = createValueStack();
         final String propertyValue = null;
         vs.getContext().put(propertyName, propertyValue);