You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2012/09/27 10:56:25 UTC
svn commit: r1390898 - in
/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory:
DataObjectCreator.java types/PropertyCreationHelper.java
Author: jens
Date: Thu Sep 27 08:56:25 2012
New Revision: 1390898
URL: http://svn.apache.org/viewvc?rev=1390898&view=rev
Log:
Fix a bug with rendition generation in InMemory
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java?rev=1390898&r1=1390897&r2=1390898&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java Thu Sep 27 08:56:25 2012
@@ -163,12 +163,6 @@ public class DataObjectCreator {
return getRelationships(includeRelationships, so, user);
}
- public static List<RenditionData> fillRenditions(StoredObject so) {
- // TODO: to be completed if renditions are implemented
- List<RenditionData> renditions = new ArrayList<RenditionData>();
- return renditions;
- }
-
public static ChangeEventInfo fillChangeEventInfo(StoredObject so) {
// TODO: to be completed if change information is implemented
ChangeEventInfo changeEventInfo = new ChangeEventInfoDataImpl();
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java?rev=1390898&r1=1390897&r2=1390898&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java Thu Sep 27 08:56:25 2012
@@ -363,10 +363,6 @@ public class PropertyCreationHelper {
od.setRelationships(DataObjectCreator.fillRelationships(includeRelationships, so, user));
}
- if (renditionFilter != null && renditionFilter.length() > 0) {
- od.setRenditions(DataObjectCreator.fillRenditions(so));
- }
-
od.setProperties(props);
// Note: do not set change event info for this call
@@ -397,9 +393,9 @@ public class PropertyCreationHelper {
od.setRelationships(DataObjectCreator.fillRelationships(includeRelationships, so, user));
}
- if (renditionFilter != null && renditionFilter.length() > 0) {
- od.setRenditions(DataObjectCreator.fillRenditions(so));
- }
+ List<RenditionData> renditions = so.getRenditions(renditionFilter, 0, 0);
+ if (null != renditions && renditions.size() > 0)
+ od.setRenditions(renditions);
od.setProperties(props);