From ecb76e74083fa9be49d8cd13807306ef732788a7 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 3 Sep 2010 20:45:41 +0000 Subject: [PATCH] Fix an Eclispe nag. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992463 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/CatalinaProperties.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java b/java/org/apache/catalina/startup/CatalinaProperties.java index 8bc26b751..f59f07e97 100644 --- a/java/org/apache/catalina/startup/CatalinaProperties.java +++ b/java/org/apache/catalina/startup/CatalinaProperties.java @@ -100,8 +100,8 @@ public class CatalinaProperties { try { File home = new File(getCatalinaBase()); File conf = new File(home, "conf"); - File properties = new File(conf, "catalina.properties"); - is = new FileInputStream(properties); + File propsFile = new File(conf, "catalina.properties"); + is = new FileInputStream(propsFile); } catch (Throwable t) { handleThrowable(t); } -- 2.11.0