Commit f3006988 authored by Spiros Koulouzis's avatar Spiros Koulouzis

null check

parent 6103520a
...@@ -143,6 +143,7 @@ public class PlannerService { ...@@ -143,6 +143,7 @@ public class PlannerService {
Map<String, Object> map = plan.getKeyValue(); Map<String, Object> map = plan.getKeyValue();
Set<String> ids = plan.getLoweLevelPlanIDs(); Set<String> ids = plan.getLoweLevelPlanIDs();
if (ids != null) {
for (String lowID : ids) { for (String lowID : ids) {
PlanResponse ll = findOne(lowID); PlanResponse ll = findOne(lowID);
Map<String, Object> lowLevelMap = ll.getKeyValue(); Map<String, Object> lowLevelMap = ll.getKeyValue();
...@@ -150,6 +151,7 @@ public class PlannerService { ...@@ -150,6 +151,7 @@ public class PlannerService {
map.put(ll.getName(), lowLevelMap); map.put(ll.getName(), lowLevelMap);
} }
} }
}
if (fromat != null && fromat.equals("yml")) { if (fromat != null && fromat.equals("yml")) {
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package nl.uva.sne.drip.drip.provisioner.utils; package nl.uva.sne.drip.drip.provisioner.utils;
import java.io.File;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.text.MessageFormat; import java.text.MessageFormat;
...@@ -40,7 +41,7 @@ public class PropertyValues { ...@@ -40,7 +41,7 @@ public class PropertyValues {
PropertyValues.HOST = prop.getProperty("rabbitmq.host", "127.0.0.1"); PropertyValues.HOST = prop.getProperty("rabbitmq.host", "127.0.0.1");
PropertyValues.RPC_QUEUE_NAME = prop.getProperty("rpc.queue.name", PropertyValues.RPC_QUEUE_NAME = prop.getProperty("rpc.queue.name",
"provisioner_queue_v1"); "provisioner_queue_v1");
PropertyValues.TRUSTED_CERTIFICATE_FOLDER = prop.getProperty("trusted.certificates.folder", "/etc/grid-security/certificates"); PropertyValues.TRUSTED_CERTIFICATE_FOLDER = prop.getProperty("trusted.certificates.folder", System.getProperty("user.home") + File.separator + ".globus" + File.separator + "certificates");
CA_BUNDLE_URL = new URL(prop.getProperty("ca.bundle.url", CA_BUNDLE_URL = new URL(prop.getProperty("ca.bundle.url",
"https://dist.eugridpma.info/distribution/igtf/current/accredited/igtf-preinstalled-bundle-classic.tar.gz")); "https://dist.eugridpma.info/distribution/igtf/current/accredited/igtf-preinstalled-bundle-classic.tar.gz"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment