Changeset 912 for DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java

Timestamp:

03/04/13 09:57:20 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java

@@ -106 +106 @@
                 if(environmentWrapper.getTimeEstimationPlugin() != null){
                         execTimeEstimationPluginClassName = environmentWrapper.getTimeEstimationPlugin().getName();
-                }
-                
-                try{
-                        execTimeEstimationPlugin = (ExecutionTimeEstimationPlugin) InstanceFactory.createInstance(
-                                        execTimeEstimationPluginClassName, ExecutionTimeEstimationPlugin.class);
-                        if(execTimeEstimationPlugin == null) {
-                                execTimeEstimationPluginClassName = "example.timeestimation.DefaultTimeEstimationPlugin";
-                                execTimeEstimationPlugin = (ExecutionTimeEstimationPlugin) InstanceFactory.createInstance(
-                                                execTimeEstimationPluginClassName, ExecutionTimeEstimationPlugin.class);
-                        } else {
+                        
+                } else {
+                        execTimeEstimationPluginClassName = "example.timeestimation.DefaultTimeEstimationPlugin";
+                }
+                
+                execTimeEstimationPlugin = (ExecutionTimeEstimationPlugin) InstanceFactory.createInstance(
+                                execTimeEstimationPluginClassName, ExecutionTimeEstimationPlugin.class);
+                if(execTimeEstimationPlugin != null) {
+                        if(environmentWrapper.getTimeEstimationPlugin() != null){
                                 Parameters params = EnvironmentWrapper.extractParameters(environmentWrapper.getTimeEstimationPlugin().getParameter());
                                 execTimeEstimationPlugin.init(params);
                         }
-                } catch (Exception e){
-                        if (execTimeEstimationPlugin == null) {
-                                throw new Exception("Can not create execution time estimation plugin instance.");
-                        }
-                }
+                }
+                else {
+                        throw new Exception("Can not create execution time estimation plugin instance.");
+                }
+
 
                 if(environmentWrapper.getComputingResources() != null) {