ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-14 22:46:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ios

Browse Source
This commit is contained in:
Joel Dice 2011-09-01 10:53:20 -06:00
commit 6949fc3d60
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classpath/java/io/BufferedReader.java
View File

@ -42,7 +42,15 @@ public class BufferedReader extends Reader {
}
for (int i = position; i < limit; ++i) {
if (buffer[i] == '\n') {
if(buffer[i] == '\r') {
sb.append(buffer, position, i - position);
position = i + 1;
if(i+1 < limit && buffer[i+1] == '\n') {
position = i + 1;
return sb.toString();
}
return sb.toString();
} else if (buffer[i] == '\n') {
sb.append(buffer, position, i - position);
position = i + 1;
return sb.toString();

2
src/type-generator.cpp
View File

@ -790,7 +790,7 @@ read(Input* in, Object* eos, int level)
}
} break;
case ' ': case '\t': case '\n': {
case ' ': case '\t': case '\n': case '\r': {
if (s.first) {
return String::make(s.first);
}