diff options
| author | Björn Gustavsson <[email protected]> | 2011-10-20 10:49:13 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-10-20 10:49:13 +0200 |
| commit | 6ef9aef50dbe839098e4330a97247aa21a15ecde (patch) | |
| tree | 4e556a50e08da2e9ab139ec0c82c00c7de1a4b4f /lib/jinterface/java_src | |
| parent | 907772538853d2f89d60702eb140e164a72503ad (diff) | |
| parent | 34db76765561487e526fe66d3d19ecf3b3fb9dc8 (diff) | |
| download | otp-6ef9aef50dbe839098e4330a97247aa21a15ecde.tar.gz otp-6ef9aef50dbe839098e4330a97247aa21a15ecde.tar.bz2 otp-6ef9aef50dbe839098e4330a97247aa21a15ecde.zip | |
Merge branch 'bjorn/unicode-noncharacters/OTP-9624'
* bjorn/unicode-noncharacters/OTP-9624:
Allow noncharacter code points in unicode encoding and decoding
Diffstat (limited to 'lib/jinterface/java_src')
| -rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java index 19ee92e0d0..23734bf83b 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java @@ -166,7 +166,7 @@ public class OtpErlangString extends OtpErlangObject implements Serializable, /** * Validate a code point according to Erlang definition; Unicode 3.0. * That is; valid in the range U+0..U+10FFFF, but not in the range - * U+D800..U+DFFF (surrogat pairs), nor U+FFFE..U+FFFF (non-characters). + * U+D800..U+DFFF (surrogat pairs). * * @param cp * the code point value to validate @@ -179,8 +179,7 @@ public class OtpErlangString extends OtpErlangObject implements Serializable, // Erlang definition of valid Unicode code points; // Unicode 3.0, XML, et.al. return (cp>>>16) <= 0x10 // in 0..10FFFF; Unicode range - && (cp & ~0x7FF) != 0xD800 // not in D800..DFFF; surrogate range - && (cp & ~1) != 0xFFFE; // not in FFFE..FFFF; non-characters + && (cp & ~0x7FF) != 0xD800; // not in D800..DFFF; surrogate range } /** |