From 216c52095ecabbe87ff4c121d7602ec35ce65123 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sun, 18 Jun 2017 11:07:25 +0200
Subject: [PATCH] Cleans up code

---
 .../apache/struts2/tiles/StrutsTilesAnnotationProcessor.java  | 4 ++--
 .../org/apache/struts2/tiles/StrutsTilesLocaleResolver.java   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesAnnotationProcessor.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesAnnotationProcessor.java
index fa5f7352f..e36b75d16 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesAnnotationProcessor.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesAnnotationProcessor.java
@@ -54,14 +54,14 @@ public class StrutsTilesAnnotationProcessor {
      * @return {@link TilesDefinition}
      */
     public TilesDefinition findAnnotation(Object action, String tileName) {
-        Class<? extends Object> clazz = action.getClass();
+        Class<?> clazz = action.getClass();
         TilesDefinition tilesDefinition = clazz.getAnnotation(TilesDefinition.class);
         TilesDefinitions tilesDefinitions = clazz.getAnnotation(TilesDefinitions.class);
 
         if (tilesDefinition == null && tilesDefinitions != null) {
             if (!StringUtils.isEmpty(tileName)) {
                 for (TilesDefinition i : tilesDefinitions.value()) {
-                    if (i.name() != null && i.name().equals(tileName)) {
+                    if (i.name().equals(tileName)) {
                         tilesDefinition = i;
                         break;
                     }
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
index e75cd4841..90b9fa002 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
@@ -20,7 +20,6 @@
 package org.apache.struts2.tiles;
 
 import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.LocaleProviderFactory;
 import com.opensymphony.xwork2.config.ConfigurationException;
 import org.apache.logging.log4j.LogManager;