Changeset 25552 for main

Timestamp:

2012-05-09T13:57:28+12:00 (12 years ago)

Author:

sjm84

Message:

We need to check that a key exists before we try to get it otherwise it may cause a seg-fault (problem in the jni code somewhere)

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java

@@ -175 +175 @@
             return null;
         }
-        String s_info;
+        String s_info = null;
         try
         {
@@ -181 +181 @@
             {
                 // The key is UTF8: do db lookup using the UTF8 version of key
-                s_info = (String) db_.fetch(key.getBytes("UTF-8"));
+                if (db_.exists(key.getBytes("UTF-8")))
+                {
+                    s_info = (String) db_.fetch(key.getBytes("UTF-8"));
+                }
             }
             catch (UnsupportedEncodingException e)
@@ -214 +217 @@
             return false;
         }
-        
+
         try
         {
@@ -238 +241 @@
             return false;
         }
-        
+
         try
         {
@@ -249 +252 @@
             return false;
         }
-        
+
         return true;
     }