diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5460fae445a..c64f2e943f1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-14  Michael Koch  <konqueror@gmx.de> 
+	    Matthias Klose  <doko@debian.org> 
+
+	* java/awt/im/InputContext.java: Initialze in, line.
+
 2004-07-13  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* interpret.cc (run): Correctly access libffi return values of
diff --git a/libjava/java/awt/im/InputContext.java b/libjava/java/awt/im/InputContext.java
index c8e7cf35a4c..2c3c6aaafd1 100644
--- a/libjava/java/awt/im/InputContext.java
+++ b/libjava/java/awt/im/InputContext.java
@@ -100,8 +100,8 @@ public class InputContext
     while (e.hasMoreElements())
       {
         URL url = (URL) e.nextElement();
-        BufferedReader in;
-        String line;
+        BufferedReader in = null;
+        String line = null;
         try
           {
             in = new BufferedReader