From aebfaf78614d477bc14fbbd25f3bd76512cc8f3e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 12 Sep 2000 05:18:25 +0000
Subject: [PATCH] Attached is a patch that prevents a NullPointerException in
the JDBC driver if the translations files have not been properly installed.
(We carefully avoided installing the translations file in a controlled
environment here specifically to test for such a bug. :-)
See attached description for more details.
William
--
William Webber william@peopleweb.net.au
---
.../jdbc/org/postgresql/util/PSQLException.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/interfaces/jdbc/org/postgresql/util/PSQLException.java b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
index 36290a5db15..1f206addce2 100644
--- a/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
+++ b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
@@ -66,17 +66,21 @@ public class PSQLException extends SQLException
try {
bundle = ResourceBundle.getBundle("org.postgresql.errors");
} catch(MissingResourceException e) {
+ // translation files have not been installed.
+ message = id;
}
}
+ if (bundle != null) {
// Now look up a localized message. If one is not found, then use
// the supplied message instead.
- message = null;
- try {
- message = bundle.getString(id);
- } catch(MissingResourceException e) {
- message = id;
- }
+ message = null;
+ try {
+ message = bundle.getString(id);
+ } catch(MissingResourceException e) {
+ message = id;
+ }
+ }
// Expand any arguments
if(args!=null)
--
GitLab