diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-10-01 21:21:43 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-10-01 21:21:43 +0200 |
| commit | a4af569e384baf0dcff0198016a309ed66b9910a (patch) | |
| tree | d3fbb11b4a5a8e30da42811cf9ba1e5c104e0af3 /src/main/java/com/c2kernel/entity | |
| parent | c16b6242d9128dacbffb9a0360aafc6d2fade76b (diff) | |
Predefined steps normally only interact with the last version of a3.0-Beta
Collection. New steps will be added to create fixed versions as needed.
Diffstat (limited to 'src/main/java/com/c2kernel/entity')
| -rw-r--r-- | src/main/java/com/c2kernel/entity/proxy/ItemProxy.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/entity/transfer/TransferItem.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java b/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java index 987873f..c59049e 100644 --- a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java +++ b/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java @@ -202,7 +202,7 @@ public class ItemProxy }
public Collection<?> getCollection(String collName) throws ObjectNotFoundException {
- return (Collection<?>)getObject(ClusterStorage.COLLECTION+"/"+collName);
+ return (Collection<?>)getObject(ClusterStorage.COLLECTION+"/"+collName+"/last");
}
public Workflow getWorkflow() throws ObjectNotFoundException {
diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java index d1379cf..d63ce23 100644 --- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java +++ b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java @@ -132,10 +132,9 @@ public class TransferItem { newItem.initialise(importAgentId.getSystemKey(),
Gateway.getMarshaller().marshall(props),
Gateway.getMarshaller().marshall(wf.search("workflow/domain")),
- null);
+ Gateway.getMarshaller().marshall(colls));
// store objects
- importByType(ClusterStorage.COLLECTION, objects); //TODO: move this to initialise
importByType(ClusterStorage.HISTORY, objects);
importByType(ClusterStorage.OUTCOME, objects);
importByType(ClusterStorage.VIEWPOINT, objects);
|