From: Javen O'Neal <onealj@apache.org>
Date: Tue, 24 Nov 2015 07:05:11 +0000 (+0000)
Subject: rewrite ternary expression as simple Math.min call (yes, the ternary expression as... 
X-Git-Tag: REL_3_14_BETA1~91
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c7a9314db4ca98068e8f557f046a487a1fd4512;p=poi.git

rewrite ternary expression as simple Math.min call (yes, the ternary expression as written is equivalent to min, not max, despite the variable being called max. I'll leave that fix up to the original author).

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1716044 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
index 39adc25f6d..8419de6e46 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
@@ -141,8 +141,9 @@ public class XSSFTable extends POIXMLDocumentPart {
                         commonTokens = tokens;
                         
                     } else {
-                        int maxLenght = commonTokens.length>tokens.length? tokens.length:commonTokens.length;
-                        for (int i =0; i<maxLenght;i++) {
+                        final int maxLength = Math.min(commonTokens.length, tokens.length);
+                         
+                        for (int i =0; i<maxLength; i++) {
                             if (!commonTokens[i].equals(tokens[i])) {
                              List<String> subCommonTokens = Arrays.asList(commonTokens).subList(0, i);