Author: tolusha Date: 2009-12-15 09:09:37 -0500 (Tue, 15 Dec 2009) New Revision: 1061 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java Log: EXOJCR-300: fix orderNumber Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2009-12-15 13:52:25 UTC (rev 1060) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2009-12-15 14:09:37 UTC (rev 1061) @@ -379,8 +379,10 @@ if (prevData.getValues() != null) { List<ValueData> values = new ArrayList<ValueData>(); - for (ValueData vd : prevData.getValues()) + for (int i = 0; i < prevData.getValues().size(); i++) { + ValueData vd = prevData.getValues().get(i); + if (vd instanceof TransientValueData) { TransientValueData tvd = (TransientValueData)vd; @@ -401,7 +403,7 @@ // TODO review TransientValueData logic about spool file and stream pvd = new StreamPersistedValueData(destFile, tvd.getSpoolFile(), tvd.getSpoolFile() == null - ? tvd.getOriginalStream() : null, vd.getOrderNumber()); + ? tvd.getOriginalStream() : null, i); values.add(pvd); } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-12-15 13:52:25 UTC (rev 1060) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-12-15 14:09:37 UTC (rev 1061) @@ -1903,7 +1903,6 @@ for (int i = 0; i < vdata.size(); i++) { ValueData vd = vdata.get(i); - // TODO vd.setOrderNumber(i); ValueIOChannel channel = valueStorageProvider.getApplicableChannel(data, i); InputStream stream; int streamLength;