Merge pull request #10 from ContainX/master

merge
inspur-iop · May 25, 2017 · 2f9d38a · 2f9d38a
2 parents a1fcaaa + e33a9cc
commit 2f9d38a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/main/java/org/openstack4j/core/transport/UntrustedSSL.java b/core/src/main/java/org/openstack4j/core/transport/UntrustedSSL.java
@@ -25,7 +25,7 @@ private UntrustedSSL() {
         {
             TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
                 public X509Certificate[] getAcceptedIssuers() {
-                    return null;
+                	return new X509Certificate[]{};
                 }
                 public void checkClientTrusted(X509Certificate[] certs, String authType) {}
                 public void checkServerTrusted(X509Certificate[] certs, String authType) {}

diff --git a/.../src/main/java/org/openstack4j/openstack/networking/domain/NeutronExtraDhcpOptCreate.java b/.../src/main/java/org/openstack4j/openstack/networking/domain/NeutronExtraDhcpOptCreate.java
@@ -3,6 +3,8 @@
 import org.openstack4j.model.network.ExtraDhcpOptCreate;
 import org.openstack4j.model.network.builder.ExtraDhcpOptBuilder;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 /**
  *
  * @author Ales Kemr
@@ -11,7 +13,9 @@ public class NeutronExtraDhcpOptCreate implements ExtraDhcpOptCreate {
 
     // {"opt_value": "testfile.1", "opt_name": "bootfile-name"}
 
+    @JsonProperty("opt_value")
     public String opt_value;
+    @JsonProperty("opt_name")
     public String opt_name;
 
     @Override