summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaif S. Naffah <raif@swiftdsl.com.au>2006-05-03 05:40:23 +0000
committerRaif S. Naffah <raif@swiftdsl.com.au>2006-05-03 05:40:23 +0000
commite52d9e739aa51694de36a700ff4393c958fbe546 (patch)
tree0cf1551b38a253210ed1e0286c2a87028224ae3b
parenta0159fa2cbc19b64623604c0da981b0f381f9d1b (diff)
downloadclasspath-e52d9e739aa51694de36a700ff4393c958fbe546.tar.gz
2006-05-03 Raif S. Naffah <raif@swiftdsl.com.au>
* tools/gnu/classpath/tools/keytool/Command.java (getCallbackHandler): Assign returned value to field handler. * tools/gnu/classpath/tools/jarsigner/Main.java (getCallbackHandler): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--tools/gnu/classpath/tools/jarsigner/Main.java2
-rw-r--r--tools/gnu/classpath/tools/keytool/Command.java2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a1b7ae4b..3e8e7b645 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-03 Raif S. Naffah <raif@swiftdsl.com.au>
+
+ * tools/gnu/classpath/tools/keytool/Command.java (getCallbackHandler):
+ Assign returned value to field handler.
+ * tools/gnu/classpath/tools/jarsigner/Main.java (getCallbackHandler):
+ Likewise.
+
2006-05-02 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* javax/swing/ScrollPaneLayout.java (layoutContainer):
diff --git a/tools/gnu/classpath/tools/jarsigner/Main.java b/tools/gnu/classpath/tools/jarsigner/Main.java
index 8ca839759..f460a96cc 100644
--- a/tools/gnu/classpath/tools/jarsigner/Main.java
+++ b/tools/gnu/classpath/tools/jarsigner/Main.java
@@ -560,7 +560,7 @@ public class Main
protected CallbackHandler getCallbackHandler()
{
if (handler == null)
- CallbackUtil.getConsoleHandler();
+ handler = CallbackUtil.getConsoleHandler();
return handler;
}
diff --git a/tools/gnu/classpath/tools/keytool/Command.java b/tools/gnu/classpath/tools/keytool/Command.java
index 235f2cc56..a59614644 100644
--- a/tools/gnu/classpath/tools/keytool/Command.java
+++ b/tools/gnu/classpath/tools/keytool/Command.java
@@ -1140,7 +1140,7 @@ abstract class Command
protected CallbackHandler getCallbackHandler()
{
if (handler == null)
- CallbackUtil.getConsoleHandler();
+ handler = CallbackUtil.getConsoleHandler();
return handler;
}