aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/nio
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/nio')
-rw-r--r--libjava/java/nio/charset/Charset.java5
-rw-r--r--libjava/java/nio/charset/CharsetEncoder.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java
index cc60c99b..889267f 100644
--- a/libjava/java/nio/charset/Charset.java
+++ b/libjava/java/nio/charset/Charset.java
@@ -187,9 +187,10 @@ public abstract class Charset implements Comparable
return canonicalName;
}
- public final boolean isRegistered (String name)
+ public final boolean isRegistered ()
{
- return !name.startsWith ("x-") && !name.startsWith ("X-");
+ return (!canonicalName.startsWith ("x-")
+ && !canonicalName.startsWith ("X-"));
}
public abstract boolean contains (Charset cs);
diff --git a/libjava/java/nio/charset/CharsetEncoder.java b/libjava/java/nio/charset/CharsetEncoder.java
index dd434a7..dc1fa99 100644
--- a/libjava/java/nio/charset/CharsetEncoder.java
+++ b/libjava/java/nio/charset/CharsetEncoder.java
@@ -319,6 +319,11 @@ public abstract class CharsetEncoder
return this;
}
+ public CodingErrorAction unmappableCharacterAction ()
+ {
+ return unmappableCharacterAction;
+ }
+
public final CharsetEncoder onUnmappableCharacter
(CodingErrorAction newAction)
{