Author: chatellier Date: 2011-05-24 16:42:28 +0000 (Tue, 24 May 2011) New Revision: 3341 Log: Test update to hibernate 3.6.4 (topia migration fail) Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-05-24 15:23:41 UTC (rev 3340) +++ isis-fish/branches/3.3.1/pom.xml 2011-05-24 16:42:28 UTC (rev 3341) @@ -45,6 +45,13 @@ <scope>compile</scope> </dependency> + <!-- <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.6.4.Final</version> + <scope>compile</scope> + </dependency> --> + <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-05-24 15:23:41 UTC (rev 3340) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-05-24 16:42:28 UTC (rev 3341) @@ -44,7 +44,6 @@ import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; -import org.hibernate.lob.ClobImpl; import org.hibernate.type.Type; import org.hibernate.usertype.CompositeUserType; @@ -423,14 +422,17 @@ st.setString(index + 1, null); st.setString(index + 2, null); st.setString(index + 3, null); - st.setClob(index + 4, new ClobImpl("")); + // 3.3.2 : st.setClob(index + 4, new ClobImpl("")); + st.setClob(index + 4, Hibernate.createClob("")); + } else { MatrixND matrix = MatrixFactory.getInstance().create((MatrixND)value); st.setString(index, matrix.getName()); st.setString(index + 1, getDimToString(matrix.getDim())); st.setString(index + 2, getDimNamesToString(matrix.getDimensionNames())); st.setString(index + 3, getSemanticsToString(matrix.getSemantics())); - st.setClob(index + 4, new ClobImpl(matrix.toList().toString())); + // 3.3.2 : st.setClob(index + 4, new ClobImpl()); + st.setClob(index + 4, Hibernate.createClob(matrix.toList().toString())); } }