[teiid-commits] teiid SVN: r3043 - in trunk: metadata/src/test/java/org/teiid/metadata/index and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-28 10:35:36 -0400 (Mon, 28 Mar 2011)
New Revision: 3043

Added:
   trunk/metadata/src/test/resources/schema.ser
Modified:
   trunk/api/src/main/java/org/teiid/metadata/Schema.java
   trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
Log:
TEIID-1537 fix to ensure that older cached schemas are loaded correctly

Modified: trunk/api/src/main/java/org/teiid/metadata/Schema.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Schema.java	2011-03-28 04:17:50 UTC (rev 3042)
+++ trunk/api/src/main/java/org/teiid/metadata/Schema.java	2011-03-28 14:35:36 UTC (rev 3043)
@@ -22,6 +22,7 @@
 
 package org.teiid.metadata;
 
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -114,4 +115,15 @@
 		this.physical = physical;
 	}
     
+    /**
+     * 7.1 schemas did not have functions
+     */
+    private void readObject(java.io.ObjectInputStream in)
+    throws IOException, ClassNotFoundException {
+    	in.defaultReadObject();
+    	if (this.functions == null) {
+    		this.functions = new LinkedHashMap<String, FunctionMethod>();
+    	}
+    }
+    
 }

Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
===================================================================
--- trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java	2011-03-28 04:17:50 UTC (rev 3042)
+++ trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java	2011-03-28 14:35:36 UTC (rev 3043)
@@ -24,10 +24,13 @@
 
 import static org.junit.Assert.*;
 
+import java.io.FileInputStream;
+import java.io.ObjectInputStream;
 import java.util.Collection;
 
 import org.junit.Test;
 import org.teiid.core.util.UnitTestUtil;
+import org.teiid.metadata.Schema;
 import org.teiid.metadata.Table;
 import org.teiid.query.metadata.TransformationMetadata;
 
@@ -54,4 +57,10 @@
 		assertFalse(t.isVirtual());
 	}
 	
+	@Test public void test71Schema() throws Exception {
+		ObjectInputStream ois = new ObjectInputStream(new FileInputStream(UnitTestUtil.getTestDataFile("schema.ser")));
+		Schema schema = (Schema) ois.readObject();
+		assertNotNull(schema.getFunctions());
+	}
+	
 }

Added: trunk/metadata/src/test/resources/schema.ser
===================================================================
(Binary files differ)


Property changes on: trunk/metadata/src/test/resources/schema.ser
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream