From 5efbfe4536cb8fcea232979530781915b0fbf505 Mon Sep 17 00:00:00 2001 From: Christian Grobmeier Date: Wed, 4 Sep 2013 13:20:34 +0000 Subject: [PATCH] removed unnecessary boxing, null check was always true git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1520015 13f79535-47bb-0310-9956-ffa450edef68 --- .../xwork2/conversion/impl/XWorkBasicConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java index b9c98621b..69e78b7ea 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java @@ -144,7 +144,7 @@ public class XWorkBasicConverter extends DefaultTypeConverter { private Object doConvertToCharacter(Object value) { if (value instanceof String) { String cStr = (String) value; - return (cStr.length() > 0) ? new Character(cStr.charAt(0)) : null; + return (cStr.length() > 0) ? cStr.charAt(0) : null; } return null; } @@ -159,7 +159,7 @@ public class XWorkBasicConverter extends DefaultTypeConverter { private Class doConvertToClass(Object value) { Class clazz = null; - if (value instanceof String && value != null && ((String) value).length() > 0) { + if (value != null && value instanceof String && ((String) value).length() > 0) { try { clazz = Class.forName((String) value); } catch (ClassNotFoundException e) {