From 6073548987b30f7f07ac59d3d9f8c5c26b6c68a4 Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Fri, 17 Jun 2016 11:06:58 +0000 Subject: [PATCH] bug 59432: move loop invariants outside the loop to marginally improve code execution speed git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1748832 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/xssf/usermodel/XSSFName.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java index be68c30500..1e592514ad 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java @@ -167,15 +167,15 @@ public final class XSSFName implements Name { validateName(name); int sheetIndex = getSheetIndex(); - - //Check to ensure no other names have the same case-insensitive name - for (int i = 0; i < _workbook.getNumberOfNames(); i++) { + int numberOfNames = _workbook.getNumberOfNames(); + //Check to ensure no other names have the same case-insensitive name at the same scope + for (int i = 0; i < numberOfNames; i++) { XSSFName nm = _workbook.getNameAt(i); - if (nm != this) { - if(name.equalsIgnoreCase(nm.getNameName()) && sheetIndex == nm.getSheetIndex()){ - String msg = "The "+(sheetIndex == -1 ? "workbook" : "sheet")+" already contains this name: " + name; - throw new IllegalArgumentException(msg); - } + if ((nm != this) + && name.equalsIgnoreCase(nm.getNameName()) + && (sheetIndex == nm.getSheetIndex())) { + String msg = "The "+(sheetIndex == -1 ? "workbook" : "sheet")+" already contains this name: " + name; + throw new IllegalArgumentException(msg); } } _ctName.setName(name); -- 2.39.5