juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Fixed bug where parsers could report the wrong line number when an error occurred.
Date Thu, 15 Mar 2018 22:50:20 GMT
This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b772b8  Fixed bug where parsers could report the wrong line number when an error
occurred.
0b772b8 is described below

commit 0b772b815b14dd2231c15a5b0af4f64ee7f0e848
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Thu Mar 15 18:50:18 2018 -0400

    Fixed bug where parsers could report the wrong line number when an error
    occurred.
---
 .../src/main/java/org/apache/juneau/parser/ParserReader.java         | 5 ++++-
 juneau-doc/src/main/javadoc/overview.html                            | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
index e536076..01489a1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -281,7 +281,10 @@ public class ParserReader extends Reader {
 		if (iCurrent <= 0)
 			throw new IOException("Buffer underflow.");
 		iCurrent--;
-		column--;
+		if (column == 0)
+			line--;
+		else
+			column--;
 		return this;
 	}
 
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index e10f7f1..a4aea2a 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -21245,12 +21245,14 @@
 					<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_examples}
 					<li class='ja'>{@link org.apache.juneau.annotation.Example}
 				</ul>
+			<li>
+				Fixed bug where parsers could report the wrong line number when an error occurred.
 		</ul>
 		
 		<h5 class='topic w800'>juneau-dto</h5>
 		<ul class='spaced-list'>
 			<li>
-				Fixed bug where Swagger {@link org.apache.juneau.dto.swagger.SchemaInfo#required(Object)}
was defined as a boolean
+				Fixed bug where Swagger {@link org.apache.juneau.dto.swagger.SchemaInfo#required(Object...)}
was defined as a boolean
 				instead of a list of strings.
 		</ul>
 		

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message