298551 SslSocketConnector does not need keystore stream

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1952 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -1,4 +1,5 @@
 jetty-7.1.4-SNAPSHOT
+ + 298551 SslSocketConnector does not need keystore stream
  + 295715 AbstractSessionManager decoupled from Context
  + 292326 Stop continuations if server is stopped.
  + 292814 Make QoSFilter and DoSFilter JMX manageable

jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSocketConnector.java

@@ -205,14 +205,10 @@ public class SslSocketConnector extends SocketConnector  implements SslConnector
     	try
         {
             if (keystorePath!=null)
-            {
                 keystoreInputStream = Resource.newResource(keystorePath).getInputStream();
-                keystore=KeyStore.getInstance(keystoreType);
-                keystore.load(keystoreInputStream,keystorePassword==null?null:keystorePassword.toString().toCharArray());
-                return keystore;
-            }
-            
-            return null;
+            keystore=KeyStore.getInstance(keystoreType);
+            keystore.load(keystoreInputStream,keystorePassword==null?null:keystorePassword.toString().toCharArray());
+            return keystore;
         }
         finally
         {