Fixed kson writing issue

realtimetech-solution · Aug 11, 2020 · 29678f0 · 29678f0
1 parent 1fe9a63
commit 29678f0
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 13 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/main/java/com/realtimetech/kson/util/string/StringWriter.java b/src/main/java/com/realtimetech/kson/util/string/StringWriter.java
@@ -53,7 +53,7 @@ public void write(char[] src) {
 	}
 
 	public void write(char[] src, int offset, int length) {
-		int size = length - offset;
+		int size = length;
 		int need = this.currentIndex + size;
 		if (need >= this.currentSize) {
 			raise(need);

diff --git a/src/main/java/com/realtimetech/kson/writer/KsonWriter.java b/src/main/java/com/realtimetech/kson/writer/KsonWriter.java
@@ -139,35 +139,33 @@ private void writeString(String value) throws IOException {
 
 		int last = 0;
 		int length = value.length();
+
 		for (int i = 0; i < length; i++) {
 			char c = value.charAt(i);
-			char[] replacement;
+			char[] replacement = null;
 			if (c < 128) {
 				replacement = CONST_REPLACEMENT_CHARS[c];
-
-				if (replacement == null) {
-					continue;
-				}
 			} else if (c == '\u2028') {
 				replacement = CONST_U2028;
 			} else if (c == '\u2029') {
 				replacement = CONST_U2029;
-			} else {
-				continue;
 			}
 
-			if (last < i) {
-				stringWriter.write(charArray, last, i - last);
-			}
+			if(replacement != null){
+				if (last < i) {
+					stringWriter.write(charArray, last, i - last);
+				}
 
-			stringWriter.write(replacement);
-			last = i + 1;
+				stringWriter.write(replacement);
+				last = i + 1;
+			}
 		}
 
 		if (last < length) {
 			stringWriter.write(charArray, last, length - last);
 		}
 
 		stringWriter.write('\"');
+
 	}
 }