Changeset 1005 for DCWoRMS/branches/coolemall/src/schedframe

Timestamp:

03/25/13 08:49:36 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe

Files:

• resources/computing/ComputingResource.java (modified) (1 diff)
• scheduling/manager/resources/ResourceManagerFactory.java (modified) (1 diff)

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

@@ -117 +117 @@
         
         public String getFullName() {
+                if(this.getResourceCharacteristic().getParameters().get("fullPath") != null){
+                        String fullPath = this.getResourceCharacteristic().getParameters().get("fullPath").get(0).getContent();
+                        return fullPath;
+                }
                 if(parent!= null){
                         return parent.getFullName() + "/" + name;

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ResourceManagerFactory.java

@@ -10 +10 @@
                 ManagedComputingResources managedResource = scheduler.getCompResources();
                 
-                if(managedResource.getType().getName().equals("DataCenter"))
+                if(managedResources == null || managedResource.getType().getName().equals("DataCenter"))
                         return new GridResourceDiscovery(scheduler);
                 else if (managedResource.getType().getName().equals("Rack"))