aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2001-09-27 00:24:52 +0000
committerTom Tromey <tromey@gcc.gnu.org>2001-09-27 00:24:52 +0000
commit03219cb5d99220b9ec99520d304fcc467f69cb73 (patch)
tree5ca5df2d1f2fc990bd822d916a85cf723ab4091a /libjava/java
parent1685382e999bf030376f295c210f4ccacbf21e91 (diff)
downloadgcc-03219cb5d99220b9ec99520d304fcc467f69cb73.zip
gcc-03219cb5d99220b9ec99520d304fcc467f69cb73.tar.gz
gcc-03219cb5d99220b9ec99520d304fcc467f69cb73.tar.bz2
Configuration.java.in (INIT_LOAD_LIBRARY): New constant.
* gnu/classpath/Configuration.java.in (INIT_LOAD_LIBRARY): New constant. * java/io/StreamTokenizer.java, java/util/ResourceBundle.java: Re-merged with Classpath. From-SVN: r45835
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/io/StreamTokenizer.java2
-rw-r--r--libjava/java/util/ResourceBundle.java9
2 files changed, 10 insertions, 1 deletions
diff --git a/libjava/java/io/StreamTokenizer.java b/libjava/java/io/StreamTokenizer.java
index 7f4790b..dfb20f2 100644
--- a/libjava/java/io/StreamTokenizer.java
+++ b/libjava/java/io/StreamTokenizer.java
@@ -407,7 +407,7 @@ public class StreamTokenizer
ttype = TT_WORD;
sval = tokbuf.toString();
if (lowerCase)
- sval.toLowerCase();
+ sval = sval.toLowerCase();
}
else if (isComment(ch))
{
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 30f28a6..f2fa776 100644
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -28,6 +28,7 @@ executable file might be covered by the GNU General Public License. */
package java.util;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
+import gnu.classpath.Configuration;
/**
* A resource bundle contains locale-specific data. If you need
@@ -73,6 +74,14 @@ import java.lang.ref.SoftReference;
* @author Jochen Hoenicke */
public abstract class ResourceBundle
{
+ static
+ {
+ if (Configuration.INIT_LOAD_LIBRARY)
+ {
+ System.loadLibrary ("javautil");
+ }
+ }
+
/**
* The parent bundle. This is consulted when you call getObject
* and there is no such resource in the current bundle. This