getAcceptedIssuers() is not supposed to return null

sebbASF · sebbASF · commit efa851cf769d · 2010-07-10T12:52:24.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0@962837 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java b/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
@@ -31,6 +31,8 @@
  */
 public class FTPSTrustManager implements X509TrustManager
 {
+    private static final X509Certificate[] EMPTY_X509CERTIFICATE_ARRAY = new X509Certificate[]{};
+
     /**
      * No-op
      */
@@ -49,6 +51,6 @@ public void checkServerTrusted(X509Certificate[] certificates, String authType)
 
     public X509Certificate[] getAcceptedIssuers()
     {
-        return null;
+        return EMPTY_X509CERTIFICATE_ARRAY;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`*/`
`32`	`32`	`public class FTPSTrustManager implements X509TrustManager`
`33`	`33`	`{`
	`34`	`+ private static final X509Certificate[] EMPTY_X509CERTIFICATE_ARRAY = new X509Certificate[]{};`
	`35`	`+`
`34`	`36`	`/**`
`35`	`37`	`* No-op`
`36`	`38`	`*/`
`@@ -49,6 +51,6 @@ public void checkServerTrusted(X509Certificate[] certificates, String authType)`
`49`	`51`
`50`	`52`	`public X509Certificate[] getAcceptedIssuers()`
`51`	`53`	`{`
`52`		`- return null;`
	`54`	`+ return EMPTY_X509CERTIFICATE_ARRAY;`
`53`	`55`	`}`
`54`	`56`	`}`