Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
index 7d36f35..78d4087 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
@@ -52,7 +52,7 @@ public class AssignItemToSlot extends PredefinedStep
     	

         String collName;

         int slotNo;

-        int entityKey;

+        int sysKey;

         Aggregation agg;

 

         Logger.msg(1, "AssignItemToSlot::request() - Starting.");

@@ -63,7 +63,7 @@ public class AssignItemToSlot extends PredefinedStep
             String[] params = getDataList(requestData);

             collName = params[0];

             slotNo = Integer.parseInt(params[1]);

-            entityKey = Integer.parseInt(params[2]);

+            sysKey = Integer.parseInt(params[2]);

         } catch (Exception e) {

             throw new InvalidDataException("Invalid parameters", "");

         }

@@ -85,12 +85,12 @@ public class AssignItemToSlot extends PredefinedStep
         boolean stored = false;

         for (AggregationMember member : agg.getMembers().list) {

             if (member.getID() == slotNo) {

-                if (member.getEntityKey() > -1)

+                if (member.getSystemKey() > -1)

                     throw new InvalidDataException("Member slot not empty", "");

                 try {

-                    member.assignEntity(entityKey);

+                    member.assignItem(sysKey);

                 } catch (MembershipException e) {

-                    throw new InvalidDataException("Entity "+entityKey+" does not fit in this slot", "");

+                    throw new InvalidDataException("Entity "+sysKey+" does not fit in this slot", "");

                 }

                 stored = true;

                 break;