Fixed Configuration deserialization.

XML config may contain additional objects that are used in Configuration constructor. So they should be skipped during deserialization.
ftldb · Aug 6, 2015 · e0fe540 · e0fe540
1 parent 625f7c0
commit e0fe540
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/main/java/ftldb/Configurator.java b/src/main/java/ftldb/Configurator.java
@@ -68,12 +68,24 @@ public static synchronized void setConfiguration(Configuration config) {
     public static Configuration newConfiguration(InputStream configXMLInputStream) {
         XMLDecoder decoder = new XMLDecoder(configXMLInputStream, null, new ExceptionListener() {
             public void exceptionThrown(Exception e) {
-                throw (e instanceof RuntimeException) ? (RuntimeException) e : new RuntimeException(e);
+                throw ((e instanceof RuntimeException) && !(e instanceof ArrayIndexOutOfBoundsException))
+                        ? (RuntimeException) e
+                        : new RuntimeException(e);
             }
         });
-        Configuration config = (Configuration) decoder.readObject();
+        Object obj;
+        do {
+            try {
+                obj = decoder.readObject();
+            } catch (ArrayIndexOutOfBoundsException e) {
+                obj = null;
+            }
+            if (obj == null) {
+                throw new RuntimeException("Provided XML contains no " + Configuration.class.getName() + " objects");
+            }
+        } while (!(obj instanceof Configuration));
         decoder.close();
-        return config;
+        return (Configuration) obj;
     }
 
 
@@ -121,7 +133,7 @@ public static synchronized void dropConfiguration() {
 
     private static void ensureConfigurationIsSet() {
         if (config == null) {
-            throw new RuntimeException("FTLDB configuration is not initialized");
+            throw new NullPointerException("FTLDB configuration is not initialized");
         }
     }
 

diff --git a/src/main/plsql/ftldb_api.pkb b/src/main/plsql/ftldb_api.pkb
@@ -123,7 +123,7 @@ is
 
   c_config constant varchar2(32767) :=
     '<?xml version="1.0" encoding="UTF-8"?>
-    <java version="1.0" class="java.beans.XMLDecoder">
+    <java version="1.4.0" class="java.beans.XMLDecoder">
       <object class="ftldb.DefaultConfiguration">
         <void property="templateLoader">
           <object class="ftldb.oracle.DatabaseTemplateLoader">

diff --git a/src/test/ftl/ftldb_config.xml b/src/test/ftl/ftldb_config.xml
@@ -16,7 +16,7 @@
     limitations under the License.
 
 -->
-<java version="1.0" class="java.beans.XMLDecoder">
+<java version="1.4.0" class="java.beans.XMLDecoder">
     <object class="ftldb.DefaultConfiguration">
         <void property="templateLoader">
             <object class="freemarker.cache.FileTemplateLoader"/>