From: Martin Ciglan Date: Mon, 7 Nov 2016 13:27:54 +0000 (+0100) Subject: Bug 7064: yang-to-source error on description X-Git-Tag: release/boron-sr2~5 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=3abb1680f36ece1f05e6bca3f326a9430ae1405b Bug 7064: yang-to-source error on description Existing logic of formatToParagraph() method doesn't expect a case when very first text sequence is longer than 80 characters and crashes in wrong condition branch. This has been fixed and tested for various inputs. Change-Id: Iefeb2b4063335561f3277c3ee40b3d9a46c418dc Signed-off-by: Martin Ciglan --- diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend index 409b1266c2..c729af79e0 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend @@ -305,10 +305,10 @@ abstract class BaseTemplate { val StringTokenizer tokenizer = new StringTokenizer(formattedText, " ", true); - while(tokenizer.hasMoreElements) { + while (tokenizer.hasMoreElements) { val nextElement = tokenizer.nextElement.toString - if(lineBuilder.length + nextElement.length > 80) { + if (lineBuilder.length != 0 && lineBuilder.length + nextElement.length > 80) { if (lineBuilder.charAt(lineBuilder.length - 1) == ' ') { lineBuilder.setLength(0) lineBuilder.append(lineBuilder.substring(0, lineBuilder.length - 1)) @@ -327,7 +327,7 @@ abstract class BaseTemplate { } } - if(isFirstElementOnNewLineEmptyChar) { + if (isFirstElementOnNewLineEmptyChar) { isFirstElementOnNewLineEmptyChar = !isFirstElementOnNewLineEmptyChar }