Changeset 1453 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing

Timestamp:

12/18/14 11:09:56 (10 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing

Files:

• ComputingResource.java (modified) (1 diff)
• description/ComputingResourceDescription.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java

@@ -127 +127 @@
                 if(event.getReason() != EventReason.SIM_INIT)
                         triggerEventUp(event);
-                if((scheduler != null && (parent != null && scheduler != parent.getScheduler()))  && !event.getSource().equals(scheduler.getFullName())){
+                if((scheduler != null && (parent != null && scheduler != parent.getScheduler()))  && (event.getSource() != null && !event.getSource().equals(scheduler.getFullName()))){
                         SchedulingEventCommand sec = new SchedulingEventCommand(this);
                         sec.execute(event);

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/description/ComputingResourceDescription.java

@@ -66 +66 @@
                         this.devices = new ArrayList<Device>();
                         for(int i = 0; i < dev.length; i++){
-                                Device device =  DeviceFactory.createDevice(new DeviceDescription(dev[i]));
-                                this.devices.add(device);
+                                long devCount = dev[i].getCount() > 1 ? dev[i].getCount() : 1;
+                                for(int j = 0; j < devCount; j++){
+                                        Device device =  DeviceFactory.createDevice(new DeviceDescription(dev[i]));
+                                        this.devices.add(device);
+                                }
                         }
                 }